[SM-Commit] GIT changes to test grimoire by Jaka Kranjc (5a59662713a6226ea403bff9efa755266d7fd97a)

Jaka Kranjc scm at mail.sourcemage.org
Sun Jun 4 06:47:44 EDT 2006


GIT changes to test grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 libs/glibc/BUILD   |    7 ++++++-
 libs/glibc/HISTORY |    3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5a59662713a6226ea403bff9efa755266d7fd97a
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    glibc: handle 32-bit mode on 64-bit (x86_64) processors correctly #11904

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 30e0a23..9982804 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -48,7 +48,12 @@ # Setup sanitised glibc-kernel-headers f
 #
 persistent_add  GLIBC_ARCH  &&
 if    [[  $(uname  -m)  =  *86_64    ]];  then
-  GLIBC_ARCH=x86_64
+  # handle 32-bit mode on 64-bit (*86_64) processors correctly #11904  
+  if grep -q -- "-m64" <<< "$CFLAGS";  then
+    GLIBC_ARCH=x86_64    
+  else
+    GLIBC_ARCH=i386 
+  fi  
 elif  [[  $(uname  -m)  =  ppc       ]];  then
   GLIBC_ARCH=ppc
 elif  [[  $(uname  -m)  =  *86       ]];  then
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 35dc5b8..08f27f2 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2006-06-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* BUILD: handle 32-bit mode on 64-bit processors correctly #11904
+
 2006-05-19 David Brown <dmlb2000 at gmail.com>
 	* PRE_INSTALL: removed explicit check of HOST for check against
 	  SMGL_COMPAT_ARCHS



More information about the SM-Commit mailing list