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

Jaka Kranjc scm at mail.sourcemage.org
Sun Jun 4 11:47:32 EDT 2006


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

 libs/glibc/BUILD   |    7 +------
 libs/glibc/HISTORY |    1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

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

    glibc: reverted the previous fix for 32b mode on 64b
    it was rendered obsolete by my last change (thanks Arwed)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index e9cd92b..fc6c555 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -48,12 +48,7 @@ # Setup sanitised glibc-kernel-headers f
 #
 persistent_add  GLIBC_ARCH  &&
 if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
-  # 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  
+  GLIBC_ARCH=x86_64    
 elif [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
   GLIBC_ARCH=ppc
 elif [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index e0d98ad..4f59979 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,5 +1,4 @@
 2006-06-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* BUILD: handle 32-bit mode on 64-bit processors correctly #11904
 	* BUILD, PRE_INSTALL: check SMGL_COMPAT_ARCHS instead of uname -m
 
 2006-05-19 David Brown <dmlb2000 at gmail.com>



More information about the SM-Commit mailing list