r1635 - in glibc-package: branches/glibc-2.4/debian trunk/debian trunk/debian/control.in trunk/debian/patches trunk/debian/patches/arm trunk/debian/patches/ia64 trunk/debian/sysdeps
Author: aurel32
Date: 2006-06-07 23:01:04 +0000 (Wed, 07 Jun 2006)
New Revision: 1635
Added:
glibc-package/trunk/debian/patches/arm/cvs-gcc4.1-raise.diff
glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/sysdeps/hurd.mk
glibc-package/trunk/debian/sysdeps/m68k.mk
Log:
* Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
upstream.
* Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 23:01:04 UTC (rev 1635)
@@ -60,6 +60,7 @@
* Remove alpha/cvs-gcc4-profile.diff (not needed anymore).
* Update alpha/submitted-xstat.diff.
* Update arm/cvs-gcc4-inline.diff.
+ * Remove arm/cvs-gcc4.1-raise.diff (merged upstream).
* Remove arm/cvs-float-byteorder.diff (merged upstream).
* Remove arm/cvs-socket-weakalias.diff (merged upstream).
* Update arm/local-ioperm.diff to reflect the new port add-on.
@@ -79,6 +80,7 @@
* Remove any/submitted-eh-frame-terminator.diff (merged upstream).
* Update any/submitted-nis-netgrp.diff.
* Remove i386/local-i486_ldt_support.diff (merged upstream).
+ * Remove ia64/cvs-gcc41-atomic_h.diff (merged upstream).
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/cvs-no-ldbl-128.diff to reflect the new port add-on.
* Update hppa/cvs-pie-relocs.diff to reflect the new port add-on.
@@ -133,6 +135,16 @@
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
+glibc (2.3.6-15) UNRELEASED; urgency=low
+
+ * Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
+ upstream.
+ * Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
+ upstream.
+ * Build with gcc 4.1 on all architectures but hurd-i386.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 00:51:49 +0200
+
glibc (2.3.6-14) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/changelog 2006-06-07 23:01:04 UTC (rev 1635)
@@ -1,3 +1,13 @@
+glibc (2.3.6-15) UNRELEASED; urgency=low
+
+ * Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
+ upstream.
+ * Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
+ upstream.
+ * Build with gcc 4.1 on all architectures but hurd-i386.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 00:51:49 +0200
+
glibc (2.3.6-14) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/control.in/main 2006-06-07 23:01:04 UTC (rev 1635)
@@ -6,7 +6,7 @@
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [hurd-i386], gcc-4.1 [!hurd-i386], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
quilt
Added: glibc-package/trunk/debian/patches/arm/cvs-gcc4.1-raise.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-gcc4.1-raise.diff 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/patches/arm/cvs-gcc4.1-raise.diff 2006-06-07 23:01:04 UTC (rev 1635)
@@ -0,0 +1,88 @@
+2005-11-11 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/raise.c (raise) [IS_IN_rtld]: Just call
+ __kill.
+
+Index: glibc/linuxthreads/sysdeps/unix/sysv/linux/raise.c
+===================================================================
+--- glibc.orig/linuxthreads/sysdeps/unix/sysv/linux/raise.c.orig 2003-01-03 01:38:38.000000000 +0100
++++ glibc/linuxthreads/sysdeps/unix/sysv/linux/raise.c 2006-06-07 22:24:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991, 1996, 2002, 2003 Free Software Foundation, Inc.
++/* Copyright (C) 1991, 1996, 2002, 2003, 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -18,10 +18,13 @@
+
+ #include <signal.h>
+ #include <unistd.h>
+-#include <bits/libc-lock.h>
+
+-#ifndef SHARED
++#ifndef IS_IN_rtld
++# include <bits/libc-lock.h>
++
++# ifndef SHARED
+ weak_extern (__pthread_raise)
++# endif
+ #endif
+
+ /* Raise the signal SIG. */
+@@ -29,8 +32,12 @@
+ raise (sig)
+ int sig;
+ {
++#ifdef IS_IN_rtld
++ return __kill (__getpid (), sig);
++#else
+ return __libc_maybe_call2 (pthread_raise, (sig),
+ __kill (__getpid (), sig));
++#endif
+ }
+ libc_hidden_def (raise)
+ weak_alias (raise, gsignal)
+2005-11-11 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/raise.c (raise) [IS_IN_rtld]: Just call
+ __kill.
+
+Index: glibc/linuxthreads/sysdeps/unix/sysv/linux/raise.c
+===================================================================
+--- glibc.orig/linuxthreads/sysdeps/unix/sysv/linux/raise.c.orig 2003-01-03 01:38:38.000000000 +0100
++++ glibc/linuxthreads/sysdeps/unix/sysv/linux/raise.c 2006-06-07 22:24:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991, 1996, 2002, 2003 Free Software Foundation, Inc.
++/* Copyright (C) 1991, 1996, 2002, 2003, 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -18,10 +18,13 @@
+
+ #include <signal.h>
+ #include <unistd.h>
+-#include <bits/libc-lock.h>
+
+-#ifndef SHARED
++#ifndef IS_IN_rtld
++# include <bits/libc-lock.h>
++
++# ifndef SHARED
+ weak_extern (__pthread_raise)
++# endif
+ #endif
+
+ /* Raise the signal SIG. */
+@@ -29,8 +32,12 @@
+ raise (sig)
+ int sig;
+ {
++#ifdef IS_IN_rtld
++ return __kill (__getpid (), sig);
++#else
+ return __libc_maybe_call2 (pthread_raise, (sig),
+ __kill (__getpid (), sig));
++#endif
+ }
+ libc_hidden_def (raise)
+ weak_alias (raise, gsignal)
Added: glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff 2006-06-07 23:01:04 UTC (rev 1635)
@@ -0,0 +1,65 @@
+2005-05-19 Richard Henderson <rth@redhat.com>
+
+ * sysdeps/ia64/bits/atomic.h (__arch_compare_and_exchange_bool_32_acq,
+ __arch_compare_and_exchange_bool_64_acq,
+ __arch_compare_and_exchange_val_32_acq,
+ __arch_compare_and_exchange_val_64_acq, atomic_exchange_and_add):
+ Use __sync builtin without _si or _di suffix.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/ia64/bits/atomic.h,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- libc/sysdeps/ia64/bits/atomic.h 2004/07/18 16:28:59 1.9
++++ libc/sysdeps/ia64/bits/atomic.h 2005/05/21 18:29:17 1.10
+@@ -52,12 +52,12 @@
+ (abort (), 0)
+
+ #define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \
+- (!__sync_bool_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
+- (int) (long) (newval)))
++ (!__sync_bool_compare_and_swap ((mem), (int) (long) (oldval), \
++ (int) (long) (newval)))
+
+ #define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \
+- (!__sync_bool_compare_and_swap_di ((void *) (mem), (long) (oldval), \
+- (long) (newval)))
++ (!__sync_bool_compare_and_swap ((mem), (long) (oldval), \
++ (long) (newval)))
+
+ #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
+ (abort (), (__typeof (*mem)) 0)
+@@ -66,12 +66,11 @@
+ (abort (), (__typeof (*mem)) 0)
+
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+- __sync_val_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \
+- (int) (long) (newval))
++ __sync_val_compare_and_swap ((mem), (int) (long) (oldval), \
++ (int) (long) (newval))
+
+ #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+- __sync_val_compare_and_swap_di ((void *) (mem), (long) (oldval), \
+- (long) (newval))
++ __sync_val_compare_and_swap ((mem), (long) (oldval), (long) (newval))
+
+ /* Atomically store newval and return the old value. */
+ #define atomic_exchange_acq(mem, value) \
+@@ -80,15 +79,9 @@
+ #define atomic_exchange_rel(mem, value) \
+ (__sync_synchronize (), __sync_lock_test_and_set (mem, value))
+
+-
+ #define atomic_exchange_and_add(mem, value) \
+ ({ __typeof (*mem) __result; \
+- if (sizeof (*mem) == 4) \
+- __result = __sync_fetch_and_add_si ((void *) (mem), (int) (value)); \
+- else if (sizeof (*mem) == 8) \
+- __result = __sync_fetch_and_add_di ((void *) (mem), (long) (value)); \
+- else \
+- abort (); \
++ __result = __sync_fetch_and_add ((mem), (int) (value)); \
+ __result; })
+
+ #define atomic_decrement_if_positive(mem) \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/patches/series 2006-06-07 23:01:04 UTC (rev 1635)
@@ -56,6 +56,7 @@
arm/cvs-float-byteorder.diff -p0
arm/cvs-gcc4-inline.diff -p1
+arm/cvs-gcc4.1-raise.diff -p1
arm/cvs-socket-weakalias.diff -p0
arm/local-dwarf2-buildfix.diff -p0
arm/local-ioperm.diff -p0
@@ -89,6 +90,8 @@
i386/local-cmov.diff -p0
i386/submitted-i686-timing.diff -p1
+ia64/cvs-gcc41-atomic_h.diff -p1
+
m32r/cvs-elf-m32r_rel32.diff -p0
m32r/local-ports-m32r.diff -p0
Modified: glibc-package/trunk/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd.mk 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/sysdeps/hurd.mk 2006-06-07 23:01:04 UTC (rev 1635)
@@ -21,3 +21,7 @@
# ld.so is broken currently if z_relro is used.
libc_extra_config_options := $(extra_config_options) --without-tls libc_cv_z_relro=no
+# Build with gcc-4.1 has not been tested.
+CC = gcc-4.0
+BUILD_CC = gcc-4.0
+
Modified: glibc-package/trunk/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/m68k.mk 2006-06-07 22:58:07 UTC (rev 1634)
+++ glibc-package/trunk/debian/sysdeps/m68k.mk 2006-06-07 23:01:04 UTC (rev 1635)
@@ -1,7 +1,3 @@
# m68k cannot be compiled with >= 2.4.xx
MIN_KERNEL_SUPPORTED := 2.2.0
-# work around to build on m68k, due to gcc-4.0 ICE. See #319312.
-CC = gcc-3.4
-BUILD_CC = gcc-3.4
-
Reply to: