[Glibc-bsd-commits] r5930 - trunk/glibc-ports/kfreebsd/i386

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-09 10:22:48 +0000 (Wed, 09 Mar 2016)
New Revision: 5930

Modified:
   trunk/glibc-ports/kfreebsd/i386/sysdep.h
Log:
Merge from upstream:

commit 07256e183efe00ed833d1f744f7eef1e103afd74
Author: Andrew Senkevich <andrew.senkevich at intel.com>
Date:   Tue Dec 30 11:34:53 2014 -0800

    i386: Fix build by GCC 5.0
    
    Fixed 3 "make check" failures on glibc 32bit built by gcc 5.0 due to EBX
    was enabled for allocation:
    
    https://gcc.gnu.org/ml/gcc-patches/2014-10/msg00892.html
    
    Tests elf/tst-tls3, elf/tst-execstack-needed, elf/tst-execstack-prog
    were failed because EBX was used as PIC register.



Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h	2016-03-06 00:24:15 UTC (rev 5929)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h	2016-03-09 10:22:48 UTC (rev 5930)
@@ -154,7 +154,7 @@
 #include <syscalls-inline.h>
 
 /* Consistency check for position-independent code.  */
-#ifdef __PIC__
+#if defined __PIC__ && !__GNUC_PREREQ (5,0)
 # define check_consistency()						      \
   ({ int __res;								      \
      __asm__ __volatile__						      \