summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-22 22:25:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-22 22:25:58 +0100
commit6b6fe26dee627bbc6506b0e96ed13a55440bcd9d (patch)
tree5569515095f4de2342514ccea35daee7e10c9482
parentd8b552dbe4dc24a7bf7dac7d05a8d9d077470347 (diff)
fix ppc64 toolchain building with eglibc, disable sparc uclibc (broken)
-rw-r--r--mk/build.mk1
-rw-r--r--target/config/Config.in1
-rw-r--r--toolchain/eglibc/Makefile5
3 files changed, 6 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 1f94fb184..cbfb371b1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -537,6 +537,7 @@ bulktoolchain:
$(GMAKE) prereq && \
$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
+ tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
if [ -f .exit ];then break;fi \
diff --git a/target/config/Config.in b/target/config/Config.in
index 8bfd1086e..3e20b46a6 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -601,6 +601,7 @@ config ADK_TARGET_LIB_UCLIBC
select ADK_uclibc
depends on \
!ADK_LINUX_MICROBLAZE && \
+ !ADK_LINUX_SPARC && \
!ADK_LINUX_SPARC64 && \
!ADK_LINUX_PPC64 && \
!ADK_LINUX_NATIVE
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 72dd1b1b7..dbccb8866 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -4,13 +4,16 @@
include $(TOPDIR)/rules.mk
include ../rules.mk
-# eglibc does not compile with Os on sparc
+# eglibc does not compile with Os on some architectures
ifeq ($(ADK_LINUX_SPARC),y)
TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
endif
ifeq ($(ADK_LINUX_MICROBLAZE),y)
TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
endif
+ifeq ($(ADK_LINUX_PPC64),y)
+TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
+endif
# ssp not supported
TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC))