Author: aurel32
Date: 2013-05-11 18:21:19 +0000 (Sat, 11 May 2013)
New Revision: 5583
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-scripts.diff
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* patches/kfreebsd/local-scripts.diff: remove dynamic linker name, now
handled by abi-variants.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-11 16:02:35 UTC (rev
5582)
+++ glibc-package/trunk/debian/changelog 2013-05-11 18:21:19 UTC (rev
5583)
@@ -26,6 +26,8 @@
#707802.
* patches/all/local-ldd.diff: check if the dynamic linker works before
using it. Closes: #631242, #707091.
+ * patches/kfreebsd/local-scripts.diff: remove dynamic linker name, now
+ handled by abi-variants.
[ Petr Salinger ]
* patches/kfreebsd/local-linuxthreads-initfini.diff: follow upstream
@@ -42,7 +44,7 @@
any/local-linuxthreads-setclock.diff
* drop obsolete any/local-linuxthreads-unwind.diff
any/local-linuxthreads-lowlevellock.diff
- * kfreebsd/local-sysdeps.diff: update to revision 4428 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 4431 (from glibc-bsd).
* Add into testsuite-checking/expected-results-*-kfreebsd-gnu-*
tst-timer5 test and new tst-backtrace[4-6] tests that are known to fail.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-scripts.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-scripts.diff
2013-05-11 16:02:35 UTC (rev 5582)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-scripts.diff
2013-05-11 18:21:19 UTC (rev 5583)
@@ -82,14 +82,6 @@
# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
.*-.*-gnu-gnu.* libmachuser=1
-@@ -57,6 +60,7 @@
- sparc64.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
- sparc.*-.*-linux.* ld=ld-linux.so.2
- sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
-+x86_64-.*-kfreebsd.* ld=ld-kfreebsd-x86-64.so.1
- # We use the ELF ABI standard name for the default.
- .*-.*-.* ld=ld.so.1
-
--- a/linuxthreads/shlib-versions
+++ b/linuxthreads/shlib-versions
@@ -8,3 +8,4 @@
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2013-05-11 16:02:35 UTC (rev 5582)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2013-05-11 18:21:19 UTC (rev 5583)
@@ -9602,8 +9602,15 @@
+/* use stub only variant */
+#include <misc/gtty.c>
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/Implies
+@@ -0,0 +1 @@
++unix/bsd/bsd4.4/kfreebsd/x86
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/Makefile
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,31 @@
++# The default ABI is 32.
++default-abi := 32
++
+ifeq ($(subdir),linuxthreads)
+CFLAGS-pt-initfini.s += -fno-asynchronous-unwind-tables
+endif
@@ -26720,8 +26727,29 @@
+#include <sysdeps/posix/writev.c>
+
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86/Makefile
+@@ -0,0 +1,11 @@
++# We don't need any header files.
++abi-includes :=
++
++abi-variants := 32 64
++
++abi-32-options := -D__i386__ -U__x86_64__
++abi-32-condition := !defined __x86_64__
++abi-32-ld-soname := ld.so.1
++abi-64-options := -U__i386__ -D__x86_64__ -U__ILP32__ -D__LP64__
++abi-64-condition := defined __x86_64__ && defined __LP64__
++abi-64-ld-soname := ld-kfreebsd-x86-64.so.1
+--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Implies
+@@ -0,0 +1 @@
++unix/bsd/bsd4.4/kfreebsd/x86
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Makefile
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,20 @@
++# The default ABI is 64.
++default-abi := 64
++
+32bit-predefine = __i386__
+64bit-predefine = __x86_64__
+
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ubeq3-000853...@vasks.debian.org
