Bug#601126: updated patch
Hi,
updated patch. Builds fine, my segfault’s gone too thanks to the
binutils change, and I unearthed another bug we can close. (That
is not in the package I just uploaded, but other than the debian
changelog, nothing differs.)
bye,
//mirabilos
--
22:20⎜ The crazy that persists in his craziness becomes a master
22:21⎜ And the distance between the craziness and geniality is
only measured by the success 22:21⎜ it’s a
very thin line anyway… with some, you don’t know which side they’re ondiff -u eglibc-2.11.2/debian/changelog eglibc-2.11.2/debian/changelog
--- eglibc-2.11.2/debian/changelog
+++ eglibc-2.11.2/debian/changelog
@@ -1,3 +1,14 @@
+eglibc (2.11.2-11+m68k.1) unreleased; urgency=low
+
+ * patches/m68k/cvs-fix-sem_t-alignment.patch: new from git (hotfix)
+ * sysdeps/m68k.mk: enable TLS (Closes: #601126) (Closes: #446503)
+- remove libc_extra_config_options (all of them, we have __thread
+ and TLS now; sanity checks were only disabled for linuxthreads)
+- use NPTL instead of linuxthreads
+ * debhelper.in/libc.preinst: require (Debian) 2.6.32 kernel on m68k
+
+ -- Thorsten Glaser Wed, 02 Feb 2011 19:11:39 +
+
eglibc (2.11.2-11) unstable; urgency=low
* patches/kfreebsd/local-sysdeps.diff: remove stub marks for at*
diff -u eglibc-2.11.2/debian/sysdeps/m68k.mk
eglibc-2.11.2/debian/sysdeps/m68k.mk
--- eglibc-2.11.2/debian/sysdeps/m68k.mk
+++ eglibc-2.11.2/debian/sysdeps/m68k.mk
@@ -2,2 +2 @@
-libc_add-ons = ports linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
--without-__thread --without-tls
+libc_add-ons = ports nptl $(add-ons)
diff -u eglibc-2.11.2/debian/patches/series eglibc-2.11.2/debian/patches/series
--- eglibc-2.11.2/debian/patches/series
+++ eglibc-2.11.2/debian/patches/series
@@ -152,6 +152,7 @@
m68k/cvs-define-m68k-tls-relocations.patch
m68k/cvs-tls-support.patch
+m68k/cvs-fix-sem_t-alignment.patch
m68k/cvs-versions-def-2-12.patch
m68k/local-compat.diff
m68k/local-dwarf2-buildfix.diff
diff -u eglibc-2.11.2/debian/debhelper.in/libc.preinst
eglibc-2.11.2/debian/debhelper.in/libc.preinst
--- eglibc-2.11.2/debian/debhelper.in/libc.preinst
+++ eglibc-2.11.2/debian/debhelper.in/libc.preinst
@@ -292,33 +292,22 @@
mips*) realarch="mips";;
esac
- # The GNU libc requires a >= 2.6.18 kernel (except on m68k)
+ # The GNU libc requires a >= 2.6.32-3 Debian kernel on m68k
+ # for TLS, or a >= 2.6.18 kernel on all other architectures
if [ "$realarch" != m68k ]
then
- if linux_compare_versions "$kernel_ver" lt 2.6.18
- then
- echo WARNING: this version of the GNU libc requires kernel
version
- echo 2.6.18 or later. Please upgrade your kernel before
installing
- echo glibc.
- kernel26_help
-
- exit 1
- fi
+ vmin=2.6.18
+ else
+ vmin=2.6.32
fi
-
- # The GNU libc is now built with --with-kernel= >= 2.4.1 on m68k
- if [ "$realarch" = m68k ]
+ if linux_compare_versions "$kernel_ver" lt ${vmin}
then
- if linux_compare_versions "$kernel_ver" lt 2.4.1
- then
- echo WARNING: This version of glibc requires that you be running
- echo kernel version 2.4.1 or later. Earlier kernels contained
- echo bugs that may render the system unusable if a modern version
- echo of glibc is installed.
- kernel26_help
+ echo WARNING: this version of the GNU libc requires kernel version
+ echo ${vmin} or later. Please upgrade your kernel before installing
+ echo glibc.
+ kernel26_help
- exit 1
- fi
+ exit 1
fi
# From glibc 2.6-3 SPARC V8 support is dropped.
only in patch2:
unchanged:
--- eglibc-2.11.2.orig/debian/patches/m68k/cvs-fix-sem_t-alignment.patch
+++ eglibc-2.11.2/debian/patches/m68k/cvs-fix-sem_t-alignment.patch
@@ -0,0 +1,65 @@
+This series of m68k related commits fixes alignment of sem_t due to
+the kernel using the lower two bit for internal purposes, whereas on
+Linux/m68k, the alignment of long is not natural. I refrain from
+patching a ChangeLog file, since I saw this break with gcc earlier.
+ -- tg@d.o
+
+From: Andreas Schwab
+Date: Sun, 2 Jan 2011 19:14:41 + (+0100)
+Subject: m68k: force alignment of sem_t
+X-Git-Tag: glibc-2.13~7
+X-Git-Url:
http://sourceware.org/git/?p=glibc-ports.git;a=commitdiff_plain;h=9524dbd1f3f91a9b381bb0e17dc5e150fe8be75a
+
+m68k: force alignment of sem_t
+---
+
+#diff --git a/ChangeLog.m68k b/ChangeLog.m68k
+#index ccd8b4e..feba28e 100644
+#--- a/ChangeLog.m68k
+#+++ b/ChangeLog.m68k
+#@@ -1,3 +1,8 @@
+#+2011-01-10 Andreas Schwab
+#+
+#+ * sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h (sem_t):
+#+ Force alignment.
+#+
+# 2010-12-26 Andreas Schwab
+#
+# * sysdeps/m68k/stackinfo.h (DEFAULT_STACK_P
Bug#601126: Updated patch FIXING IMPORTANT BUG on m68k
Hi,
please apply the attached patch instead, it unbreaks sem_wait()
used by boehm-gc/gcj on m68k. Diff to the previous one from
Andreas Schwab. (The jump from .1 to .4 is since I’ve had some
intermediate test versions.)
bye,
//mirabilos
--
Solange man keine schmutzigen Tricks macht, und ich meine *wirklich*
schmutzige Tricks, wie bei einer doppelt verketteten Liste beide
Pointer XORen und in nur einem Word speichern, funktioniert Boehm ganz
hervorragend. -- Andreas Bogk über boehm-gc in d.a.s.rdiff -u eglibc-2.11.2/debian/changelog eglibc-2.11.2/debian/changelog
--- eglibc-2.11.2/debian/changelog
+++ eglibc-2.11.2/debian/changelog
@@ -1,3 +1,24 @@
+eglibc (2.11.2-7+m68k.4) unreleased; urgency=low
+
+ * debian/sysdeps/m68k.mk: set libc_MIN_KERNEL_SUPPORTED back
+to 2.4.1 to retain compatibility code; version checking is
+done in debian/debhelper.in/libc.preinst anyway so no harm
+ * debian/patches/m68k/local-fix-semaphore.diff: new from ML
+
+ -- Thorsten Glaser Mon, 03 Jan 2011 00:08:37 +
+
+eglibc (2.11.2-7+m68k.1) unreleased; urgency=low
+
+ * debian/sysdeps/m68k.mk: switch m68k to TLS
+- use nptl instead of linuxthreads
+- remove libc_extra_config_options (all of them, we have __thread
+ and tls now; sanity checks were only disabled for linuxthreads)
+- raise minimum kernel version to 2.6.16 and document why we can't
+ set it to 2.6.32 (Debian) yet which would be correct/desired
+ * debian/debhelper.in/libc.preinst: require 2.6.32 kernel on m68k
+
+ -- Thorsten Glaser Mon, 01 Nov 2010 15:09:16 +
+
eglibc (2.11.2-7) unstable; urgency=low
[ Samuel Thibault ]
diff -u eglibc-2.11.2/debian/debhelper.in/libc.preinst
eglibc-2.11.2/debian/debhelper.in/libc.preinst
--- eglibc-2.11.2/debian/debhelper.in/libc.preinst
+++ eglibc-2.11.2/debian/debhelper.in/libc.preinst
@@ -292,33 +292,22 @@
mips*) realarch="mips";;
esac
- # The GNU libc requires a >= 2.6.18 kernel (except on m68k)
+ # The GNU libc requires a >= 2.6.32-3 Debian kernel on m68k
+ # for TLS, or a >= 2.6.18 kernel on all other architectures
if [ "$realarch" != m68k ]
then
- if linux_compare_versions "$kernel_ver" lt 2.6.18
- then
- echo WARNING: this version of the GNU libc requires kernel
version
- echo 2.6.18 or later. Please upgrade your kernel before
installing
- echo glibc.
- kernel26_help
-
- exit 1
- fi
+ vmin=2.6.18
+ else
+ vmin=2.6.32
fi
-
- # The GNU libc is now built with --with-kernel= >= 2.4.1 on m68k
- if [ "$realarch" = m68k ]
+ if linux_compare_versions "$kernel_ver" lt ${vmin}
then
- if linux_compare_versions "$kernel_ver" lt 2.4.1
- then
- echo WARNING: This version of glibc requires that you be running
- echo kernel version 2.4.1 or later. Earlier kernels contained
- echo bugs that may render the system unusable if a modern version
- echo of glibc is installed.
- kernel26_help
+ echo WARNING: this version of the GNU libc requires kernel version
+ echo ${vmin} or later. Please upgrade your kernel before installing
+ echo glibc.
+ kernel26_help
- exit 1
- fi
+ exit 1
fi
# From glibc 2.6-3 SPARC V8 support is dropped.
diff -u eglibc-2.11.2/debian/sysdeps/m68k.mk
eglibc-2.11.2/debian/sysdeps/m68k.mk
--- eglibc-2.11.2/debian/sysdeps/m68k.mk
+++ eglibc-2.11.2/debian/sysdeps/m68k.mk
@@ -2,2 +2 @@
-libc_add-ons = ports linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
--without-__thread --without-tls
+libc_add-ons = ports nptl $(add-ons)
diff -u eglibc-2.11.2/debian/patches/series eglibc-2.11.2/debian/patches/series
--- eglibc-2.11.2/debian/patches/series
+++ eglibc-2.11.2/debian/patches/series
@@ -159,6 +159,7 @@
m68k/local-reloc.diff
m68k/local-pthread_lock.diff
m68k/submitted-gcc34-seccomment.diff
+m68k/local-fix-semaphore.diff
mips/cvs-mips-atomic_h.diff
mips/cvs-non-pic-n32-64-syscall.diff
only in patch2:
unchanged:
--- eglibc-2.11.2.orig/debian/patches/m68k/local-fix-semaphore.diff
+++ eglibc-2.11.2/debian/patches/m68k/local-fix-semaphore.diff
@@ -0,0 +1,32 @@
+From sch...@linux-m68k.org Sun Jan 2 20:08:54 2011
+From: Andreas Schwab
+Message-ID:
+Date: Sun, 02 Jan 2011 20:59:08 +0100
+Subject: Re: Another gcj (boehm-gc?) related FTBFS for y’all to look at
+
+Please try this patch.
+
+Andreas.
+
+diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
b/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
+index 2950cc9..baaa9eb 100644
+--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
b/ports/sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2010 Free Software Foundation, Inc.
++/* Copyright
Bug#601126: updated patch
Hi,
after the last upload I rebuilt. Hope this helps.
bye,
//mirabilos
--
I believe no one can invent an algorithm. One just happens to hit upon it
when God enlightens him. Or only God invents algorithms, we merely copy them.
If you don't believe in God, just consider God as Nature if you won't deny
existence. -- Coywolf Qi Huntdiff -u eglibc-2.11.2/debian/changelog eglibc-2.11.2/debian/changelog
--- eglibc-2.11.2/debian/changelog
+++ eglibc-2.11.2/debian/changelog
@@ -1,3 +1,15 @@
+eglibc (2.11.2-7+m68k.1) unreleased; urgency=low
+
+ * debian/sysdeps/m68k.mk: switch m68k to TLS
+- use nptl instead of linuxthreads
+- remove libc_extra_config_options (all of them, we have __thread
+ and tls now; sanity checks were only disabled for linuxthreads)
+- raise minimum kernel version to 2.6.16 and document why we can't
+ set it to 2.6.32 (Debian) yet which would be correct/desired
+ * debian/debhelper.in/libc.preinst: require 2.6.32 kernel on m68k
+
+ -- Thorsten Glaser Mon, 01 Nov 2010 15:09:16 +
+
eglibc (2.11.2-7) unstable; urgency=low
[ Samuel Thibault ]
diff -u eglibc-2.11.2/debian/debhelper.in/libc.preinst
eglibc-2.11.2/debian/debhelper.in/libc.preinst
--- eglibc-2.11.2/debian/debhelper.in/libc.preinst
+++ eglibc-2.11.2/debian/debhelper.in/libc.preinst
@@ -292,33 +292,22 @@
mips*) realarch="mips";;
esac
- # The GNU libc requires a >= 2.6.18 kernel (except on m68k)
+ # The GNU libc requires a >= 2.6.32-3 Debian kernel on m68k
+ # for TLS, or a >= 2.6.18 kernel on all other architectures
if [ "$realarch" != m68k ]
then
- if linux_compare_versions "$kernel_ver" lt 2.6.18
- then
- echo WARNING: this version of the GNU libc requires kernel
version
- echo 2.6.18 or later. Please upgrade your kernel before
installing
- echo glibc.
- kernel26_help
-
- exit 1
- fi
+ vmin=2.6.18
+ else
+ vmin=2.6.32
fi
-
- # The GNU libc is now built with --with-kernel= >= 2.4.1 on m68k
- if [ "$realarch" = m68k ]
+ if linux_compare_versions "$kernel_ver" lt ${vmin}
then
- if linux_compare_versions "$kernel_ver" lt 2.4.1
- then
- echo WARNING: This version of glibc requires that you be running
- echo kernel version 2.4.1 or later. Earlier kernels contained
- echo bugs that may render the system unusable if a modern version
- echo of glibc is installed.
- kernel26_help
+ echo WARNING: this version of the GNU libc requires kernel version
+ echo ${vmin} or later. Please upgrade your kernel before installing
+ echo glibc.
+ kernel26_help
- exit 1
- fi
+ exit 1
fi
# From glibc 2.6-3 SPARC V8 support is dropped.
diff -u eglibc-2.11.2/debian/sysdeps/m68k.mk
eglibc-2.11.2/debian/sysdeps/m68k.mk
--- eglibc-2.11.2/debian/sysdeps/m68k.mk
+++ eglibc-2.11.2/debian/sysdeps/m68k.mk
@@ -1,3 +1,5 @@
-libc_MIN_KERNEL_SUPPORTED = 2.4.1
-libc_add-ons = ports linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
--without-__thread --without-tls
+# actually, Debian 2.6.32-23 and up, or Mainline 2.6.34
+# but we need the compatibility functions compiled in through
+# this until patched appropriately
+libc_MIN_KERNEL_SUPPORTED = 2.6.16
+libc_add-ons = ports nptl $(add-ons)
