From e4dfe199dd2f22e1a3ce837cd5582eb0f2731fbc Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 12 Sep 2011 19:04:55 +0200
Subject: [PATCH] glibc: fixed build of 32 Bit library on x86-64 when multilib
 is enabled

Note:

We need to inject proper -march while building 32 Bit ABI
---
 base/glibc/glibc.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 84b8b9efc..95cf64c83 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -69,6 +69,16 @@ pkg_glibc_abi_preconf() {
 	slibdir="lib$1"
 	echo_status "slibdir: $slibdir"
 
+	# architecture specific compiler flags for 32bit ABIs
+	if [ "$1" = "32" ]; then
+		case "$arch" in
+			x86-64)
+				var_append CC_WRAPPER_INSERT ' ' "-march=$(echo $arch_target | cut -d- -f1)"
+				var_append CXX_WRAPPER_INSERT ' ' "-march=$(echo $arch_target | cut -d- -f1)"
+				;;
+		esac
+	fi
+
 	# applies to all additional ABIs while building multilib
 	if [ $buildloop -ge 2 ]; then
 		# only install libraries and no programs