use TARGET_CFLAGS_LIBC without ABI cflags for glibc

7 files changed, 13 insertions, 14 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 87a861da7..f391653d1 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
+KERNEL_MD5SUM:=		becf09adcea30bcbdb43cdd60710d3cc
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_6_1),y)
 KERNEL_VERSION:=	3.6.1
@@ -14,11 +14,11 @@ ifeq ($(ADK_KERNEL_VERSION_3_5_6),y)
 KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
+KERNEL_MD5SUM:=		becf09adcea30bcbdb43cdd60710d3cc
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_4_13),y)
 KERNEL_VERSION:=	3.4.13
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		f9cd4fe763396bf814f3a71de42fde9b
+KERNEL_MD5SUM:=		9c850d00c898ba792f29eb6a5973961c
 endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 6fc2eb192..02d54d787 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -95,7 +95,8 @@ TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
 TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 
 TARGET_CPPFLAGS:=	
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
+TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS)
+TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
diff --git a/target/mips/target.mk b/target/mips/target.mk
index 03065d411..f4864d2cc 100644
--- a/target/mips/target.mk
+++ b/target/mips/target.mk
@@ -2,4 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			mips
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
 TARGET_OPTIMIZATION:=	-Os -pipe
-TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS) $(ADK_TARGET_ABI_CFLAGS)
+TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk
index 7fe893ec7..94a646401 100644
--- a/target/x86_64/target.mk
+++ b/target/x86_64/target.mk
@@ -2,4 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			x86
 CPU_ARCH:=		x86_64
 TARGET_OPTIMIZATION:=	-O2 -pipe
-TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS) $(ADK_TARGET_ABI_CFLAGS)
+TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 8214e2237..d72693fd8 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -19,7 +19,7 @@ EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			BUILD_CC=${CC_FOR_BUILD} \
 			GCC_HONOUR_COPTS=s \
-			CFLAGS="$(TARGET_CFLAGS)" \
+			CFLAGS="$(TARGET_CFLAGS_LIBC)" \
 			CC=${REAL_GNU_TARGET_NAME}-gcc \
 			CXX=${REAL_GNU_TARGET_NAME}-g++ \
 			AR=${REAL_GNU_TARGET_NAME}-ar \
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 16791824e..98a01d9c8 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 # glibc does not compile with Os
-TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS))
+TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
 ifneq ($(ADK_DEBUG),)
-TARGET_CFLAGS+=	-O2
+TARGET_CFLAGS_LIBC+=	-O2
 endif
 
 # ssp partially supported
@@ -39,7 +39,7 @@ $(WRKBUILD)/.headers_configure:
 		(cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
 			${GLIBC_ENV} \
 			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
-			$(WRKBUILD)/libc/configure \
+			$(WRKBUILD)/configure \
 				--prefix=$(STAGING_TARGET_DIR)-$${abi/*:/}/usr \
 				--with-sysroot=$(STAGING_TARGET_DIR)-$${abi/*:/} \
 				--host=$${abi/:*/} \
@@ -56,8 +56,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 			$(MAKE) ${GLIBC_MAKEOPTS} install-headers \
 		); \
 	done
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
 	touch $@
 else
 $(WRKBUILD)/.headers_configure:
@@ -90,7 +88,7 @@ $(WRKBUILD)/.configured:
 		(cd $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/}; \
 			${GLIBC_ENV} \
 			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
-			$(WRKBUILD)/libc/configure \
+			$(WRKBUILD)/configure \
 				--prefix=/usr \
 				--enable-shared \
 				--enable-stackguard-randomization \
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 80d836437..0d37ef3e5 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -21,7 +21,7 @@ GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--enable-add-ons
 GLIBC_ENV:=             PATH='${TARGET_PATH}' \
                         BUILD_CC=${CC_FOR_BUILD} \
-                        CFLAGS="$(TARGET_CFLAGS)" \
+                        CFLAGS="$(TARGET_CFLAGS_LIBC)" \
                         CC=${REAL_GNU_TARGET_NAME}-gcc \
                         CXX=${REAL_GNU_TARGET_NAME}-g++ \
                         AR=${REAL_GNU_TARGET_NAME}-ar \