r1695 - in glibc-package/branches/glibc-2.4/debian: . patches/m68k sysdeps
Author: schizo
Date: 2006-08-01 22:54:40 +0000 (Tue, 01 Aug 2006)
New Revision: 1695
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
Log:
go nptl-only on linux
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-01 22:54:40 UTC (rev 1695)
@@ -23,14 +23,11 @@
- Add any/local-bashisms.diff: fix invalid test operator (==)
in run-iconv-test.sh
- debian/rules.d/build.mk: don't try to build html documentation.
- - debian/sysdeps/hppa.mk: use ports and linuxthreads add-ons
- - debian/sysdeps/ia64.mk: build with linuxthreads instead of NPTL
- - debian/sysdeps/m68k.mk: use ports and linuxthreads add-ons
- - debian/sysdeps/mips.mk: use ports and linuxthreads add-ons
- - debian/sysdeps/mipsel.mk: use ports and linuxthreads add-ons
- - debian/sysdeps/i386.mk: disable sanity checks on linuxthreads build
- - debian/sysdeps/powerpc.mk: build with linuxthreads instead of NPTL
- - debian/sysdeps/arm.mk: use ports and linuxthreads add-ons
+ - debian/sysdeps/hppa.mk: use ports add-on
+ - debian/sysdeps/m68k.mk: use ports add-on
+ - debian/sysdeps/mips.mk: use ports add-on
+ - debian/sysdeps/mipsel.mk: use ports add-on
+ - debian/sysdeps/arm.mk: use ports add-on
- Build with gcc 4.1 on all architectures.
- debian/patches/sparc/local-linuxthreads.diff: fill in missing
preprocessor macros.
@@ -137,7 +134,7 @@
check for updated resolv.conf before a nameserver call.
* debian/patches/series: Use it.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
+ -- Clint Adams <schizo@debian.org> Sun, 28 May 2006 03:28:14 +0200
glibc (2.3.6-16) UNRELEASED; urgency=low
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,6 +1,5 @@
-diff -urN glibc-2.3.6.original/sysdeps/m68k/fpu/bits/mathinline.h glibc-2.3.6/sysdeps/m68k/fpu/bits/mathinline.h
---- glibc-2.3.6.original/sysdeps/m68k/fpu/bits/mathinline.h 2004-10-09 23:18:03.000000000 +0200
-+++ glibc-2.3.6/sysdeps/m68k/fpu/bits/mathinline.h 2006-07-09 00:31:17.000000000 +0200
+--- glibc-2.3.6.original/ports/sysdeps/m68k/fpu/bits/mathinline.h 2004-10-09 23:18:03.000000000 +0200
++++ glibc-2.3.6/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-07-09 00:31:17.000000000 +0200
@@ -18,6 +18,22 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -2,10 +2,7 @@
# disabled because alpha linuxthreads ex7, ex9, ex10, ex18 stopps eternally
# even if TIMEOUTSCALE is set - SIGALRM from the program is just ignored.
-RUN_TESTSUITE = no
+#RUN_TESTSUITE = no
# disabled for static linked pthread programs.
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
-
-# NPTL Config
-GLIBC_PASSES += nptl
+libc_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,6 +1,4 @@
-# build libc with nptl instead of linuxthreads
libc_MIN_KERNEL_SUPPORTED = 2.6.0
-libc_add-ons = nptl $(add-ons)
libc_extra_cflags = -O3 -g1
libc_slibdir = /lib
libc_libdir = /usr/lib
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,3 +1,3 @@
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = ports nptl $(add-ons)
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+libc_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,4 +1,4 @@
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = ports nptl $(add-ons)
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,4 +1,4 @@
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+libc_extra_config_options = $(extra_config_options)
define libc6_extra_pkg_install
mkdir -p debian/$(curpass)/usr/lib
@@ -9,10 +9,9 @@
# NPTL requires at least i486 assembly. We don't need to take
# special measures for i386 systems, since Debian kernel images now
# emulate the missing instructions on the i386.
-GLIBC_PASSES += nptl
-nptl_configure_target=i486-linux
-nptl_configure_build=i486-linux
-nptl_extra_cflags = -march=i486 -mtune=i686 -g1 -O3
+libc_configure_target=i486-linux
+libc_configure_build=i486-linux
+libc_extra_cflags = -march=i486 -mtune=i686 -g1 -O3
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,4 +1 @@
libc = libc6.1
-
-# NPTL Config
-GLIBC_PASSES += nptl
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,11 +1,11 @@
GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
-MIN_KERNEL_SUPPORTED := 2.4.1
+MIN_KERNEL_SUPPORTED := 2.6.0
libc = libc6
# Linuxthreads Config
threads = yes
-libc_add-ons = linuxthreads $(add-ons)
-libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
+libc_add-ons = nptl $(add-ons)
+libc_extra_config_options = $(extra_config_options)
ifndef LINUX_SOURCE
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1 +1 @@
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = ports nptl $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,3 +1,3 @@
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = ports nptl $(add-ons)
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks --without-tls
+libc_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,3 +1,3 @@
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = ports nptl $(add-ons)
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks --without-tls
+libc_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,6 +1,3 @@
-# NPTL Config
-GLIBC_PASSES += nptl
-
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,6 +1,3 @@
-# NPTL Config
-GLIBC_PASSES += nptl
-
# build 64-bit (s390x) alternative library
GLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-08-01 15:00:57 UTC (rev 1694)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-08-01 22:54:40 UTC (rev 1695)
@@ -1,6 +1,3 @@
-# NPTL Config
-GLIBC_PASSES += nptl
-
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
Reply to: