From 081fbf36fbcf3e95d08aaf7565124bf21a96da9e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 2 Apr 2014 07:57:38 +0200
Subject: fix superh toolchain building

---
 mk/build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 78079bea9..af1313206 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -471,9 +471,9 @@ bulktoolchain:
 		while read arch; do \
 			mkdir -p ${TOPDIR}/firmware; \
 		    ( \
-			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
 			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
+			echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
-- 
cgit v1.2.3


From 830cbab2bf7c28ce2de623fc06350a1030106200 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 2 Apr 2014 21:03:46 +0200
Subject: add optimization flags for microblaze

---
 mk/vars.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index a26dc0734..a13de04b8 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -123,6 +123,11 @@ TARGET_CXXFLAGS+=	-flto
 TARGET_LDFLAGS+=	-flto
 endif
 
+ifeq ($(ADK_LINUX_MICROBLAZE),y)
+TARGET_CFLAGS+=		-mxl-barrel-shift
+TARGET_CXX_FLAGS+=	-mxl-barrel-shift
+endif
+
 ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
 else
-- 
cgit v1.2.3


From c79407bcee5a5a9a1a718efb54e851e939e6f8d1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 3 Apr 2014 15:18:33 +0200
Subject: eanble option to debug optimized code

---
 mk/vars.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index a26dc0734..136dc5f2f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -124,7 +124,11 @@ TARGET_LDFLAGS+=	-flto
 endif
 
 ifneq ($(ADK_DEBUG),)
+ifeq ($(ADK_DEBUG_OPTS),y)
+TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
+else
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
+endif
 else
 TARGET_CPPFLAGS+=	-DNDEBUG
 TARGET_CFLAGS+=		-fomit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
-- 
cgit v1.2.3


From 8316d0355b3f3d3c2bcad9d3900feb2bec40da46 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 5 Apr 2014 06:07:19 +0200
Subject: fix iso building

---
 mk/image.mk | 2 +-
 mk/vars.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/image.mk b/mk/image.mk
index ee2f991e0..9e755ad1a 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -238,7 +238,7 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
 		${TARGET_DIR}/boot/syslinux
 	echo 'DEFAULT /boot/kernel root=/dev/sr0' > \
 		${TARGET_DIR}/boot/syslinux/isolinux.cfg
-	${STAGING_HOST_DIR}/usr/bin/mkisofs -R -uid 0 -gid 0 -o $@ \
+	PATH='${HOST_PATH}' mkisofs -R -uid 0 -gid 0 -o $@ \
 		-b boot/syslinux/isolinux.bin \
 		-c boot/syslinux/boot.cat -no-emul-boot \
 		-boot-load-size 4 -boot-info-table ${TARGET_DIR}
diff --git a/mk/vars.mk b/mk/vars.mk
index 3215ff1a5..e804ad5e6 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -54,7 +54,7 @@ SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 
 # PATH variables
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
-HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
 
 ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
-- 
cgit v1.2.3