Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 libs/glibc/BUILD   |    4 ++--
 libs/glibc/HISTORY |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3494dd128df3f2962fc11b4a35fe172ab8127a2e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

    glibc: unset CFLAGS instead of export CFLAGS=''
    
    On i686 there is a weird bug in which with CFLAGS set but empty, there
    is a problem with the PIC register being set to ecx and the glibc code
    not dealing with that properly leading to the following error:
    
    i686-pc-linux-gnu-gcc dl-load.c -c -std=gnu11 -fgnu89-inline  -g -O2 
-Wall -Wwrite-strings -Wundef -Werror -fmerge-all-constants -frounding-math 
-fno-stack-protector -Wstrict-prototypes -Wold-style-definition -fmath-errno  
   -fno-stack-protector -DSTACK_PROTECTOR_LEVEL=0 -Wa,-mtune=i686 -Wno-unused 
 -ftls-model=initial-exec    -I/usr/src/glibc-2.29/linux-4.19.19/usr/include  
-I../include -I/usr/src/glibc-2.29.bld/elf  -I/usr/src/glibc-2.29.bld  
-I../sysdeps/unix/sysv/linux/i386/i686  -I../sysdeps/i386/i686/nptl  
-I../sysdeps/unix/sysv/linux/i386  -I../sysdeps/unix/sysv/linux/x86/include 
-I../sysdeps/unix/sysv/linux/x86  -I../sysdeps/x86/nptl  
-I../sysdeps/i386/nptl  -I../sysdeps/unix/sysv/linux/include 
-I../sysdeps/unix/sysv/linux  -I../sysdeps/nptl  -I../sysdeps/pthread  
-I../sysdeps/gnu  -I../sysdeps/unix/inet  -I../sysdeps/unix/sysv  
-I../sysdeps/unix/i386  -I../sysdeps/unix  -I../sysdeps/posix  
-I../sysdeps/i386/i686/fpu  -I../sysdeps/i386/i686  -I../sysdeps/i386/fpu  
-I../sysdeps/x86/fpu/include -I../sysdeps/x86/fpu  -I../sysdeps/i386  
-I../sysdeps/x86  -I../sysdeps/wordsize-32  -I../sysdeps/ieee754/float128  
-I../sysdeps/ieee754/ldbl-96/include -I../sysdeps/ieee754/ldbl-96  
-I../sysdeps/ieee754/dbl-64  -I../sysdeps/ieee754/flt-32  
-I../sysdeps/ieee754  -I../sysdeps/generic  -I.. -I../libio -I. -nostdinc 
-isystem /usr/lib/gcc/i686-pc-linux-gnu/8.3.0/include -isystem 
/usr/lib/gcc/i686-pc-linux-gnu/8.3.0/include-fixed -isystem 
/usr/src/glibc-2.29/linux-4.19.19/usr/include  -D_LIBC_REENTRANT -include 
/usr/src/glibc-2.29.bld/libc-modules.h -DMODULE_NAME=libc -include 
../include/libc-symbols.h  -DPIC  -I/usr/src/glibc-2.29.bld/elf/. 
-I/usr/src/glibc-2.29.bld/csu/.   -DTOP_NAMESPACE=glibc -o 
/usr/src/glibc-2.29.bld/elf/dl-load.o -MD -MP -MF 
/usr/src/glibc-2.29.bld/elf/dl-load.o.dt -MT 
/usr/src/glibc-2.29.bld/elf/dl-load.o
    /tmp/cceUFowU.s: Assembler messages:
    /tmp/cceUFowU.s:9354: Error: symbol `__x86.get_pc_thunk.cx' is already 
defined
    make[2]: *** [../o-iterator.mk:9: /usr/src/glibc-2.29.bld/elf/dl-load.o] 
Error 1
    
    This was observed in an earlier version of glibc, but it seems it was
    never really resolved:
    https://sourceware.org/ml/libc-alpha/2014-11/msg00801.html
    
    unsetting CFLAGS instead of setting it to an empty string resolves the
    problem.

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 36ce673..957313c 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,5 +1,5 @@
-# clear all cflags
-export CFLAGS=''
+# clear cflags
+unset CFLAGS
 
 if [[ $GLIBC_DEBUG == "y" ]]; then
   LDFLAGS="${LDFLAGS/-s/}"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index eefabfa..d7efd1f 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2019-05-06 Remko van der Vossen <wich AT sourcemage.org>
+       * PRE_BUILD: unset CFLAGS instead of export CFLAGS=''
+
 2019-05-03 Treeve Jelbert <treeve AT sourcemage.org>
        * PREPARE: delete typo