r1701 - in glibc-package/branches/glibc-2.4/debian: . patches patches/sparc script.in sysdeps
Author: aurel32
Date: 2006-08-06 07:33:33 +0000 (Sun, 06 Aug 2006)
New Revision: 1701
Removed:
glibc-package/branches/glibc-2.4/debian/patches/sparc/local-linuxthreads.diff
glibc-package/branches/glibc-2.4/debian/patches/sparc/local-sysdep.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh
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/i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.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/ppc64.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
Log:
* clean sysdeps/*.mk now that NPTL is the default
* remove some linuxthreads specific patches
* debian/sysdeps/m68k.mk: use linuxthreads instead of NPTL.
* debian/sysdeps/m32r.mk: use linuxthreads instead of NPTL.
* debian/script.in/kernelcheck.sh: set the minimum kernel version to 2.6.0,
except on m68k where it is set to 2.4.1.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-06 07:33:33 UTC (rev 1701)
@@ -29,8 +29,6 @@
- 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.
- debian/debhelper.in/nscd.init: partially sync nscd initscript
with upstream.
- Remove mips/local-librt.diff.
@@ -118,11 +116,12 @@
* Update any/local-libgcc-compat-{all,others}.diff and split them into
any/local-libgcc-compat-{main,ports}.diff.
* Add sparc/local-fork.diff (use fork.c instead of fork.S).
- * Add sparc/local-sysdep.diff (pull in __syscall_error routine when
- building with linuxthreads).
* Add any/local-__thread.diff (make glibc buildable without __thread support)
from Michael Banck. (Closes: #361064)
- * debian/sysdeps/alpha.mk: do an NPTL pass.
+ * debian/sysdeps/m68k.mk: use linuxthreads instead of NPTL.
+ * debian/sysdeps/m32r.mk: use linuxthreads instead of NPTL.
+ * debian/script.in/kernelcheck.sh: set the minimum kernel version to 2.6.0,
+ except on m68k where it is set to 2.4.1.
[Jeff Bailey]
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-06 07:33:33 UTC (rev 1701)
@@ -94,9 +94,7 @@
powerpc/local-sysconf.diff -p1
sparc/local-fork.diff -p0
-sparc/local-linuxthreads.diff
sparc/local-sparcv8-target.diff -p0
-sparc/local-sysdep.diff -p0
sparc/submitted-timing.diff -p1
all/local-remove-manual.diff
Deleted: glibc-package/branches/glibc-2.4/debian/patches/sparc/local-linuxthreads.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/sparc/local-linuxthreads.diff 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/patches/sparc/local-linuxthreads.diff 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,101 +0,0 @@
-Index: glibc-2.4/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
-===================================================================
---- glibc-2.4.orig/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h 2006-05-22 22:55:28.000000000 -0400
-+++ glibc-2.4/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h 2006-05-22 22:55:32.000000000 -0400
-@@ -54,6 +54,96 @@
- SYSCALL_ERROR_HANDLER \
- SYSCALL_ERROR_HANDLER2
-
-+#ifdef LINKER_HANDLES_R_SPARC_WDISP22
-+/* Unfortunately, we cannot do this yet. Linker doesn't seem to
-+ * handle R_SPARC_WDISP22 against non-STB_LOCAL symbols properly . */
-+# define SYSCALL_ERROR_HANDLER_ENTRY(handler) \
-+ .section .gnu.linkonce.t.handler,"ax",@progbits; \
-+ .globl handler; \
-+ .hidden handler; \
-+ .type handler,@function; \
-+handler:
-+#else
-+# define SYSCALL_ERROR_HANDLER_ENTRY(handler) \
-+ .subsection 3; \
-+handler:
-+#endif
-+
-+#if RTLD_PRIVATE_ERRNO
-+# define SYSCALL_ERROR_HANDLER \
-+ .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \
-+ .globl __sparc_get_pic_l7; \
-+ .hidden __sparc_get_pic_l7; \
-+ .type __sparc_get_pic_l7,@function; \
-+__sparc_get_pic_l7: \
-+ retl; \
-+ add %o7, %l7, %l7; \
-+ .previous; \
-+SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
-+ save %sp,-96,%sp; \
-+ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \
-+ call __sparc_get_pic_l7; \
-+ add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \
-+ ld [%l7 + rtld_errno], %l0; \
-+ st %i0, [%l0]; \
-+ jmpl %i7+8, %g0; \
-+ restore %g0, -1, %o0; \
-+ .previous;
-+#elif USE___THREAD
-+# ifndef NOT_IN_libc
-+# define SYSCALL_ERROR_ERRNO __libc_errno
-+# else
-+# define SYSCALL_ERROR_ERRNO errno
-+# endif
-+# ifdef SHARED
-+# define SYSCALL_ERROR_HANDLER \
-+ .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \
-+ .globl __sparc_get_pic_l7; \
-+ .hidden __sparc_get_pic_l7; \
-+ .type __sparc_get_pic_l7,@function; \
-+__sparc_get_pic_l7: \
-+ retl; \
-+ add %o7, %l7, %l7; \
-+ .previous; \
-+SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
-+ save %sp,-96,%sp; \
-+ sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %l1; \
-+ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \
-+ call __sparc_get_pic_l7; \
-+ add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \
-+ add %l1, %tie_lo10(SYSCALL_ERROR_ERRNO), %l1; \
-+ ld [%l7 + %l1], %l1, %tie_ld(SYSCALL_ERROR_ERRNO); \
-+ st %i0, [%g7 + %l1], %tie_add(SYSCALL_ERROR_ERRNO); \
-+ jmpl %i7+8, %g0; \
-+ restore %g0, -1, %o0; \
-+ .previous;
-+# else
-+# define SYSCALL_ERROR_HANDLER \
-+SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
-+ sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %g1; \
-+ sethi %hi(_GLOBAL_OFFSET_TABLE_), %g2; \
-+ add %g1, %tie_lo10(SYSCALL_ERROR_ERRNO), %g1; \
-+ add %g2, %lo(_GLOBAL_OFFSET_TABLE_), %g2; \
-+ ld [%g2 + %g1], %g1, %tie_ld(SYSCALL_ERROR_ERRNO); \
-+ st %o0, [%g7 + %g1], %tie_add(SYSCALL_ERROR_ERRNO); \
-+ jmpl %o7+8, %g0; \
-+ mov -1, %o0; \
-+ .previous;
-+# endif
-+#else
-+# define SYSCALL_ERROR_HANDLER \
-+SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
-+ .global __errno_location; \
-+ .type __errno_location,@function; \
-+ save %sp, -96, %sp; \
-+ call __errno_location; \
-+ nop; \
-+ st %i0, [%o0]; \
-+ jmpl %i7+8, %g0; \
-+ restore %g0, -1, %o0; \
-+ .previous;
-+#endif
-+
- #define SYSCALL_ERROR_HANDLER2 \
- SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
- .global __errno_location; \
Deleted: glibc-package/branches/glibc-2.4/debian/patches/sparc/local-sysdep.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/sparc/local-sysdep.diff 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/patches/sparc/local-sysdep.diff 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,11 +0,0 @@
-2006-05-28 Aurelien Jarno <aurelien@aurel32.net>
-
- * linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile: pull in
- __syscall_error routine when building with linuxthreads.
-
-
---- /dev/null 2006-05-24 08:39:47.042929312 +0200
-+++ linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile 2003-01-12 09:12:11.000000000 +0100
-@@ -0,0 +1,2 @@
-+# pull in __syscall_error routine
-+libpthread-routines += sysdep
Modified: glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh
===================================================================
--- glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh 2006-08-06 07:33:33 UTC (rev 1701)
@@ -55,102 +55,28 @@
#fi
fi
- # The GNU libc is now built with --with-kernel= >= 2.4.1, except on m68k
+ # The GNU libc requires 2.6 kernel (except on m68k) because we drop to
+ # support linuxthreads
if [ "$realarch" != m68k ]
then
if kernel_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.
+ echo WARNING: POSIX threads library NPTL requires 2.6 and
+ echo later kernel. If you use 2.4 kernel, please upgrade your
+ echo kernel before installing glibc.
exit_check
fi
fi
- # SPARC sun4m requires a recent kernel
- if [ "$realarch" = sparc ]
+
+ # The GNU libc is now built with --with-kernel= >= 2.4.1 on m68k
+ if [ "$realarch" = m68k ]
then
- cputype=`egrep '^type.*:.*sun4m' /proc/cpuinfo 2> /dev/null` || true
-
- if [ "$cputype" != "" ]
+ if kernel_compare_versions "$kernel_ver" lt 2.4.1
then
- if kernel_compare_versions "$kernel_ver" lt 2.4.21
- then
- echo WARNING: You have a cpu which requires kernel 2.4.21
- echo or greater in order to install this version of glibc.
- echo Please upgrade the kernel before installing this package.
- echo
- echo You should be able to install the latest version of the
- echo sparc kernel-image in order to satisfy this need. You
- echo can also download and compile the latest kernel source
- echo yourself from a kernel mirror \(see http://www.kernel.org/\).
- exit_check
- fi
- fi
- fi
- # HPPA boxes require latest fixes in the kernel to function properly.
- if [ "$realarch" = parisc ]
- then
- if kernel_compare_versions "$kernel_ver" lt 2.4.17
- then
- echo WARNING: This version of glibc requires that you be running
- echo atleast a 2.4.17 kernel in order to work properly. Earlier
- echo kernels did not provide the proper functionality in order
- echo for the system to be stable.
- exit_check
- fi
- fi
- # parisc64 boxes require latest fixes in the kernel 2.4.19-pa17 or later
- # (in 2.4.x), 2.5.53-pa3 or later (in 2.5.x), to function properly.
- # Note that parisc64 kernel version scheme is "`uname -r`-64".
- if [ "$realarch" = parisc64 ]
- then
- kernel_ver_pa=$(echo "$kernel_ver" | sed 's/pa//')
- if [ "$kernel_ver" = "$kernel_ver_pa" ]
- then
- if kernel_compare_versions "$kernel_ver" lt 2.4.19-64
- then
- echo WARNING: This version of glibc requires that you be
- echo running at least a 2.4.19-64 to work properly.
- echo Earlier kernels did not provide the proper functionality
- echo in order for the system to be stable.
- exit_check
- fi
- else
- if kernel_compare_versions "$kernel_ver" lt 2.4.19-pa17
- then
- echo WARNING: This version of glibc requires that you be
- echo running at least a 2.4.19-pa17 in \(2.4\) or 2.5.53-pa3
- echo \(in 2.5\) to work properly.
- echo Earlier kernels did not provide the proper functionality
- echo in order for the system to be stable.
- exit_check
- fi
- fi
- fi
-
- if [ "$realarch" = mips ] \
- && [ DEB_HOST_ARCH = mips ]
- then
- # MIPS (but not mipsel) require a kernel update for the msq fixes.
- if kernel_compare_versions "$kernel_ver" lt 2.4.22
- then
- echo WARNING: System V message queues require kernel 2.4.22 to
- echo work correctly on this architecture. Some programs
- echo "(including perl) may not operate correctly."
- exit_check
- fi
- fi
-
- # amd64 requires 2.6 kernel because we drop to support linuxthreads
- if [ "$realarch" = x86_64 ] \
- && [ DEB_HOST_ARCH = amd64 ]
- then
- if kernel_compare_versions "$kernel_ver" lt 2.6.0
- then
- echo WARNING: POSIX threads library NPTL requires 2.6 and
- echo later kernel on amd64. If you use 2.4 kernel, please
- echo upgrade your kernel before installing glibc.
+ 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.
exit_check
fi
fi
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/alpha.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -3,6 +3,3 @@
# 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
-
-# disabled for static linked pthread programs.
-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-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,4 +1,3 @@
-libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_extra_cflags = -O3 -g1
libc_slibdir = /lib
libc_libdir = /usr/lib
@@ -23,7 +22,6 @@
i386_rtlddir = /lib
i386_slibdir = /emul/ia32-linux/lib
i386_libdir = /emul/ia32-linux/usr/lib
-i386_MIN_KERNEL_SUPPORTED = 2.6.0
define libc6-dev-i386_extra_pkg_install
mkdir -p debian/libc6-dev-i386/usr/include
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,3 +1 @@
libc_add-ons = ports nptl $(add-ons)
-
-libc_extra_config_options = $(extra_config_options)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,5 +1,3 @@
-libc_extra_config_options = $(extra_config_options)
-
define libc6_extra_pkg_install
mkdir -p debian/$(curpass)/usr/lib
ln -sf i486-linux-gnu debian/$(curpass)/lib/i386-linux-gnu
@@ -18,24 +16,20 @@
# The optimized libraries also use NPTL!
GLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc6-i686
-i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
i686_rtlddir = /lib
i686_slibdir = /lib/tls/i686/cmov
-i686_MIN_KERNEL_SUPPORTED = 2.6.0
i686_extra_config_options = $(extra_config_options) --disable-profile
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly reduce the speed when running under the Xen hypervisor.
GLIBC_PASSES += xen
DEB_ARCH_REGULAR_PACKAGES += libc6-xen
-xen_add-ons = nptl $(add-ons)
xen_configure_target=i686-linux
xen_extra_cflags = -march=i686 -mtune=i686 -g1 -O3 -mno-tls-direct-seg-refs
xen_rtlddir = /lib
xen_slibdir = /lib/tls/i686/cmov
-xen_MIN_KERNEL_SUPPORTED = 2.6.0
xen_extra_config_options = $(extra_config_options) --disable-profile
# build 64-bit (amd64) alternative library
@@ -46,13 +40,11 @@
# __x86_64__ is defined here because Makeconfig uses -undef and the
# /usr/include/asm wrappers need that symbol.
amd64_CC = $(CC) -m64 -D__x86_64__
-amd64_add-ons = nptl $(add-ons)
amd64_extra_cflags = -O3 -g1
amd64_extra_config_options = $(extra_config_options) --disable-profile \
--includedir=/usr/include/x86_64-linux-gnu
amd64_slibdir = /lib64
amd64_libdir = /usr/lib64
-amd64_MIN_KERNEL_SUPPORTED = 2.6.0
define amd64_extra_install
cp debian/tmp-amd64/usr/bin/ldd debian/tmp-libc/usr/bin
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,2 +1,3 @@
libc_MIN_KERNEL_SUPPORTED = 2.6.9
libc_add-ons = ports linuxthreads $(add-ons)
+libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1 +1,3 @@
-libc_add-ons = ports nptl $(add-ons)
+libc_MIN_KERNEL_SUPPORTED = 2.4.1
+libc_add-ons = ports linuxthreads $(add-ons)
+libc_extra_config_options = $(extra_config_options) --disable-sanity-checks
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,3 +1 @@
libc_add-ons = ports nptl $(add-ons)
-
-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-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,3 +1 @@
libc_add-ons = ports nptl $(add-ons)
-
-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-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,10 +1,8 @@
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
-ppc64_MIN_KERNEL_SUPPORTED = 2.6.0
ppc64_configure_target = powerpc64-linux
ppc64_CC = $(CC) -m64
-ppc64_add-ons = nptl $(add-ons)
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
ppc64_extra_cflags = -O3 -g1
ppc64_slibdir = /lib64
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/ppc64.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/ppc64.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,6 +1,3 @@
-# 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
@@ -19,12 +16,10 @@
powerpc_configure_target = powerpc-linux
powerpc_CC = $(CC) -m32
-powerpc_add-ons = nptl $(add-ons)
powerpc_extra_cflags = -O3 -g1
powerpc_rtlddir = /lib
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
-powerpc_MIN_KERNEL_SUPPORTED = 2.6.0
# create a symlink for the 32 bit dynamic linker in /lib
define libc6-powerpc_extra_pkg_install
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,10 +1,8 @@
# build 64-bit (s390x) alternative library
GLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-s390x_MIN_KERNEL_SUPPORTED = 2.6.0
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
-s390x_add-ons = nptl $(add-ons)
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g1 -O3
s390x_slibdir = /lib64
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-08-05 17:49:00 UTC (rev 1700)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-08-06 07:33:33 UTC (rev 1701)
@@ -1,12 +1,10 @@
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
-sparc64_MIN_KERNEL_SUPPORTED = 2.6.0
sparc64_configure_target=sparc64-linux
sparc64_CC = $(BUILD_CC) -m64
sparc64_extra_cflags = -g1 -O3
sparc64_extra_config_options = $(extra_config_options) --disable-profile
-sparc64_add-ons = nptl $(add-ons)
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
@@ -14,23 +12,19 @@
# build a sparcv9 optimized library
GLIBC_PASSES += sparcv9
DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9
-sparcv9_MIN_KERNEL_SUPPORTED = 2.6.0
sparcv9_configure_target=sparcv9-linux
sparcv9_configure_build=sparcv9-linux
sparcv9_extra_cflags = -g1 -O3
sparcv9_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9_add-ons = nptl $(add-ons)
sparcv9_rtlddir = /lib
sparcv9_slibdir = /lib/v9
# build a sparcv9b optimized library
GLIBC_PASSES += sparcv9b
DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9b
-sparcv9b_MIN_KERNEL_SUPPORTED = 2.6.0
sparcv9b_configure_target=sparcv9b-linux
sparcv9b_configure_build=sparcv9b-linux
sparcv9b_extra_cflags = -mtune=ultrasparc3 -g1 -O3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9b_add-ons = nptl $(add-ons)
sparcv9b_rtlddir = /lib
sparcv9b_slibdir = /lib/ultra3
Reply to: