Author: ps-guest
Date: 2013-05-08 16:21:16 +0000 (Wed, 08 May 2013)
New Revision: 5565

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 4418 (from glibc-bsd).



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2013-05-08 15:39:03 UTC (rev 
5564)
+++ glibc-package/trunk/debian/changelog        2013-05-08 16:21:16 UTC (rev 
5565)
@@ -24,7 +24,7 @@
   * patches/kfreebsd/local-no-pldd.diff: pldd is linux only utility
   * patches/kfreebsd/local-nscd-nosendfile-fix.diff: handle system without
     sendfile syscall
-  * kfreebsd/local-sysdeps.diff: update to revision 4417 (from glibc-bsd).
+  * kfreebsd/local-sysdeps.diff: update to revision 4418 (from glibc-bsd).
     Fixes sys/mount.h without C99.  Closes: #704598.
 
  -- Adam Conrad <[email protected]>  Tue, 07 May 2013 13:58:05 -0600

Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff      
2013-05-08 15:39:03 UTC (rev 5564)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff      
2013-05-08 16:21:16 UTC (rev 5565)
@@ -10891,7 +10891,7 @@
 +ENTRY (__vfork)
 +
 +# ifdef SHARED
-+      call    __i686.get_pc_thunk.cx
++      call    GET_PC_THUNK(cx)
 +      addl    $_GLOBAL_OFFSET_TABLE_, %ecx
 +      cmpl    $0, __libc_pthread_functions@GOTOFF(%ecx)
 +# else
@@ -12029,7 +12029,7 @@
 +#endif        /* !PIC */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h
-@@ -0,0 +1,216 @@
+@@ -0,0 +1,230 @@
 +/* Copyright (C) 1992,1993,1995-2000,2002,2003,2004
 +   Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -12066,6 +12066,20 @@
 +#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


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to