瀏覽代碼

fix ppc64 toolchain building with eglibc, disable sparc uclibc (broken)

Waldemar Brodkorb 11 年之前
父節點
當前提交
6b6fe26dee
共有 3 個文件被更改,包括 6 次插入1 次删除
  1. 1 0
      mk/build.mk
  2. 1 0
      target/config/Config.in
  3. 4 1
      toolchain/eglibc/Makefile

+ 1 - 0
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 \

+ 1 - 0
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

+ 4 - 1
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))