Browse Source

fix ppc64/sh4 glibc toolchain building

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Waldemar Brodkorb 8 years ago
parent
commit
a10807f338
2 changed files with 13 additions and 8 deletions
  1. 2 0
      target/config/Config.in.gcc
  2. 11 8
      toolchain/glibc/Makefile

+ 2 - 0
target/config/Config.in.gcc

@@ -6,6 +6,7 @@ prompt "GCC version"
 default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
+default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
 default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC_NG if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG
 default ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_MUSL
@@ -31,6 +32,7 @@ config ADK_TOOLCHAIN_GCC_5_3_0
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_OR1K
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !(ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH)
 
 config ADK_TOOLCHAIN_GCC_4_9_3
 	bool "4.9.3"

+ 11 - 8
toolchain/glibc/Makefile

@@ -11,6 +11,14 @@ TARGET_CFLAGS:=		$(filter-out -fno-asynchronous-unwind-tables,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=		$(filter-out -fstack-protector-all,$(TARGET_CFLAGS))
 TARGET_LDFLAGS:=	$(filter-out -fstack-protector-all,$(TARGET_LDFLAGS))
 
+# glibc does not compile with Os
+TARGET_CFLAGS:=		$(subst Os,O2,$(TARGET_CFLAGS))
+TARGET_CXXFLAGS:=	$(subst Os,O2,$(TARGET_CXXFLAGS))
+ifneq ($(ADK_DEBUG),)
+TARGET_CFLAGS+=		-O2
+TARGET_CXXFLAGS+=	-O2
+endif
+
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(GNU_TARGET_NAME) \
 			--with-headers=$(STAGING_TARGET_DIR)/usr/include \
@@ -36,9 +44,9 @@ GLIBC_CONFOPTS+=	--with-fp
 endif
 
 GLIBC_ENV:=             PATH='${TARGET_PATH}' \
-			CONFIG_SHELL='$(strip ${SHELL})' \
                         BUILD_CC=${CC_FOR_BUILD} \
                         CFLAGS="$(TARGET_CFLAGS)" \
+                        CXXFLAGS="$(TARGET_CXXFLAGS)" \
                         CC="${TARGET_CC}" \
                         CXX="${TARGET_CXX}" \
                         AR="${TARGET_AR}" \
@@ -47,19 +55,14 @@ GLIBC_ENV:=             PATH='${TARGET_PATH}' \
 			libc_cv_cc_with_libunwind=yes \
                         libc_cv_c_cleanup=yes \
                         libc_cv_gnu99_inline=yes \
-			libc_cv_initfini_array=yes \
-
-# glibc does not compile with Os
-TARGET_CFLAGS:=		$(subst Os,O2,$(TARGET_CFLAGS))
-ifneq ($(ADK_DEBUG),)
-TARGET_CFLAGS+=		-O2
-endif
+			libc_cv_initfini_array=yes
 
 GLIBC_MAKEOPTS+=	cross-compiling=yes
 ifeq (${ADK_MAKE_PARALLEL},y)
 GLIBC_MAKEOPTS+=	PARALLELMFLAGS="-j$(ADK_MAKE_JOBS)"
 endif
 
+
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
 $(WRKBUILD)/.configured: