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

[Petr Salinger]

Author: ps-guest
Date: 2013-06-27 09:30:58 +0000 (Thu, 27 Jun 2013)
New Revision: 4619

Modified:
   trunk/glibc-ports/kfreebsd/i386/sysdep.h
Log:
sync with current linux version


Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h	2013-06-27 08:01:53 UTC (rev 4618)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h	2013-06-27 09:30:58 UTC (rev 4619)
@@ -29,25 +29,6 @@
 #include <dl-sysdep.h>
 #include <tls.h>
 
-#if defined __i686 && defined __ASSEMBLER__
-#undef __i686
-#define __i686 __i686
-#endif
-
-#ifdef	__ASSEMBLER__
-# if __GNUC_PREREQ (4, 7)
-#  define GET_PC_THUNK(reg) __x86.get_pc_thunk.reg
-# else
-#  define GET_PC_THUNK(reg) __i686.get_pc_thunk.reg
-# endif
-#else
-# if __GNUC_PREREQ (4, 7)
-#  define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
-# else
-#  define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
-# endif
-#endif
-
 #ifdef __ASSEMBLER__
 
 /* We don't want the label for the error handle to be global when we define
@@ -179,20 +160,11 @@
 # define check_consistency()						      \
   ({ int __res;								      \
      __asm__ __volatile__						      \
-       ("call __i686.get_pc_thunk.cx;"					      \
-	"addl $_GLOBAL_OFFSET_TABLE_, %%ecx;"				      \
+       (LOAD_PIC_REG_STR (cx) ";"					      \
 	"subl %%ebx, %%ecx;"						      \
 	"je 1f;"							      \
 	"ud2;"								      \
 	"1:\n"								      \
-	".section .gnu.linkonce.t.__i686.get_pc_thunk.cx,\"ax\", at progbits;"   \
-	".globl __i686.get_pc_thunk.cx;"				      \
-	".hidden __i686.get_pc_thunk.cx;"				      \
-	".type __i686.get_pc_thunk.cx, at function;"			      \
-	"__i686.get_pc_thunk.cx:"					      \
-	"movl (%%esp), %%ecx;"						      \
-	"ret;"								      \
-	".previous"							      \
 	: "=c" (__res));						      \
      __res; })
 #endif