From 7534cbe4b81a6df31e865f978f4bf799bfe6745f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Jun 2009 20:10:51 +0000 Subject: [PATCH] Define "brokenRedHatKernel = true" in $NIXPKGS_CONFIG to build a system that works on Red Hat Linux, i.e. that is based on glibc version 2.5. Furthermore, this patch fixes a number of gcc 4.3.3 build errors in glibc 2.5 that occur on both x86 and x86_64. The older version of this library is still useful for running Nix on a Red Hat host. Newer version of glibc fail to detect the kernel's capabilities correctly (due to mad patches applied to the kernel by Red Hat). The individual changes are: * Re-activated glibc 2.5 in all-packages.nix. * Fix incomplete header search path in bootstrap tools. Gcc-wrapper sets "-B" to tell the compiler about its installation root. Unfortunately, the setting doesn't add $gcc/lib/gcc/*/*/include-fixed to the search path. That directory is required, however, because it contains the system-specific "limits.h" file, and the glibc 2.5 builds tries to find that file via #include_next. * Support intrinsic functions like __signbit() or atof() correctly to avoid compile-time conflicts. * Switch to NPTL. Linuxthreads is no longer supported. * Added a meta attribute to glibc package. * Updated nixUnstable to version 0.13pre15614 from trunk. The previous version failed regression tests. * Fix more strict type checking in binutils since 2.18.50.0.3. Without this patch, the build failed on x86, saying: ../sysdeps/i386/fpu/ftestexcept.c: Assembler messages: ../sysdeps/i386/fpu/ftestexcept.c:33: Error: suffix or operands invalid for `fnstsw' svn path=/nixpkgs/branches/stdenv-updates/; revision=16037 --- pkgs/build-support/gcc-wrapper/builder.sh | 11 +- .../libraries/glibc-2.5/builder.sh | 16 +- .../libraries/glibc-2.5/default.nix | 24 +- .../libraries/glibc-2.5/glibc-inline.patch | 1822 +++++++++++++++++ .../libraries/glibc-2.5/x86-fnstsw.patch | 32 + .../tools/package-management/nix/unstable.nix | 8 +- pkgs/top-level/all-packages.nix | 7 +- 7 files changed, 1890 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/libraries/glibc-2.5/glibc-inline.patch create mode 100644 pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 0691b4273254..0fe3f3768f2a 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -17,8 +17,15 @@ if test -z "$nativeLibc"; then # against the crt1.o from our own glibc, rather than the one in # /usr/lib. (This is only an issue when using an `impure' # compiler/linker, i.e., one that searches /usr/lib and so on.) - echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags - + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + echo "-L$libc/lib" > $out/nix-support/libc-ldflags # The dynamic linker is passed in `ldflagsBefore' to allow diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc-2.5/builder.sh index 19ed717de3b3..695a3a1ab3da 100644 --- a/pkgs/development/libraries/glibc-2.5/builder.sh +++ b/pkgs/development/libraries/glibc-2.5/builder.sh @@ -1,6 +1,5 @@ # glibc cannot have itself in its rpath. export NIX_NO_SELF_RPATH=1 -export NIX_DONT_SET_RPATH=1 source $stdenv/setup @@ -9,17 +8,12 @@ export PWD_P=$(type -tP pwd) postUnpack() { - cd $sourceRoot - unpackFile $linuxthreadsSrc - cd .. + cd $sourceRoot/.. } preConfigure() { - # Use Linuxthreads instead of NPTL. - rm -rf nptl - for i in configure io/ftwtest-sh; do substituteInPlace "$i" \ --replace "@PWD@" "pwd" @@ -27,7 +21,7 @@ preConfigure() { mkdir ../build cd ../build - + configureScript=../$sourceRoot/configure } @@ -38,6 +32,7 @@ postConfigure() { # test binaries. export NIX_CFLAGS_LINK= export NIX_LDFLAGS_BEFORE= + export NIX_DONT_SET_RPATH=1 } @@ -48,11 +43,6 @@ postInstall() { rm $out/etc/ld.so.cache (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - # Workaround for the wrong getting installed. This - # appears to be a regression: - # http://www.mail-archive.com/debian-glibc@lists.debian.org/msg31543.html - cp ../$sourceRoot/linuxthreads/semaphore.h $out/include - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink # "lib64" to "lib". if test -n "$is64bit"; then diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc-2.5/default.nix index e4720cf56d52..abfc3d0f4395 100644 --- a/pkgs/development/libraries/glibc-2.5/default.nix +++ b/pkgs/development/libraries/glibc-2.5/default.nix @@ -12,22 +12,26 @@ stdenv.mkDerivation { md5 = "1fb29764a6a650a4d5b409dda227ac9f"; }; - linuxthreadsSrc = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.5.tar.bz2; - md5 = "870d76d46dcaba37c13d01dca47d1774"; - }; - - patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ]; + patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ./glibc-inline.patch ./x86-fnstsw.patch ]; inherit kernelHeaders installLocales; inherit (stdenv) is64bit; - # `--with-tls --without-__thread' enables support for TLS but causes - # it not to be used. Required if we don't want to barf on 2.4 - # kernels. Or something. configureFlags="--enable-add-ons --with-headers=${kernelHeaders}/include - --with-tls --without-__thread --disable-sanity-checks + --disable-sanity-checks ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; + + # Workaround for this bug: + # http://sourceware.org/bugzilla/show_bug.cgi?id=411 + # I.e. when gcc is compiled with --with-arch=i686, then the + # preprocessor symbol `__i686' will be defined to `1'. This causes + # the symbol __i686.get_pc_thunk.dx to be mangled. + NIX_CFLAGS_COMPILE = "-U__i686"; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library"; + }; } diff --git a/pkgs/development/libraries/glibc-2.5/glibc-inline.patch b/pkgs/development/libraries/glibc-2.5/glibc-inline.patch new file mode 100644 index 000000000000..19e400e0d50f --- /dev/null +++ b/pkgs/development/libraries/glibc-2.5/glibc-inline.patch @@ -0,0 +1,1822 @@ +--- libc/mach/mach/mig_support.h.jj 2001-07-06 06:55:35.000000000 +0200 ++++ libc/mach/mach/mig_support.h 2006-11-07 11:18:32.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1993,94,97,99,2001 Free Software Foundation, Inc. ++/* Copyright (C) 1993,94,97,99,2001,2006 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 +@@ -67,12 +67,12 @@ extern void mig_reply_setup (const mach_ + /* Idiocy support function. */ + extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len); + extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); +-extern __inline vm_size_t ++__extern_inline vm_size_t + __mig_strncpy (char *__dst, const char *__src, vm_size_t __len) + { + return __stpncpy (__dst, __src, __len) - __dst; + } +-extern __inline vm_size_t ++__extern_inline vm_size_t + mig_strncpy (char *__dst, const char *__src, vm_size_t __len) + { + return __mig_strncpy (__dst, __src, __len); +--- libc/mach/lock-intern.h.jj 2001-07-06 06:55:34.000000000 +0200 ++++ libc/mach/lock-intern.h 2006-11-06 21:05:34.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1994, 1996 Free Software Foundation, Inc. ++/* Copyright (C) 1994, 1996, 2006 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 +@@ -22,7 +22,7 @@ + #include + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + +--- libc/include/stdlib.h.jj 2006-01-14 13:08:56.000000000 +0100 ++++ libc/include/stdlib.h 2006-11-06 21:08:02.000000000 +0100 +@@ -139,43 +139,43 @@ libc_hidden_proto (____strtoll_l_interna + libc_hidden_proto (____strtoul_l_internal) + libc_hidden_proto (____strtoull_l_internal) + +-extern __inline double ++__extern_inline double + __NTH (__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, + __locale_t __loc)) + { + return ____strtod_l_internal (__nptr, __endptr, 0, __loc); + } +-extern __inline long int ++__extern_inline long int + __NTH (__strtol_l (__const char *__restrict __nptr, char **__restrict __endptr, + int __base, __locale_t __loc)) + { + return ____strtol_l_internal (__nptr, __endptr, __base, 0, __loc); + } +-extern __inline unsigned long int ++__extern_inline unsigned long int + __NTH (__strtoul_l (__const char *__restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) + { + return ____strtoul_l_internal (__nptr, __endptr, __base, 0, __loc); + } +-extern __inline float ++__extern_inline float + __NTH (__strtof_l (__const char *__restrict __nptr, char **__restrict __endptr, + __locale_t __loc)) + { + return ____strtof_l_internal (__nptr, __endptr, 0, __loc); + } +-extern __inline long double ++__extern_inline long double + __NTH (__strtold_l (__const char *__restrict __nptr, + char **__restrict __endptr, __locale_t __loc)) + { + return ____strtold_l_internal (__nptr, __endptr, 0, __loc); + } +-__extension__ extern __inline long long int ++__extension__ __extern_inline long long int + __NTH (__strtoll_l (__const char *__restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) + { + return ____strtoll_l_internal (__nptr, __endptr, __base, 0, __loc); + } +-__extension__ extern __inline unsigned long long int ++__extension__ __extern_inline unsigned long long int + __NTH (__strtoull_l (__const char * __restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) + { +--- libc/include/ctype.h.jj 2004-03-16 11:09:04.000000000 +0100 ++++ libc/include/ctype.h 2006-11-06 21:06:24.000000000 +0100 +@@ -15,7 +15,7 @@ extern int __isctype (int __c, int __mas + # include + + # ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */ +-# define CTYPE_EXTERN_INLINE extern inline ++# define CTYPE_EXTERN_INLINE __extern_inline + # endif + + __libc_tsd_define (extern, CTYPE_B) +--- libc/include/sys/stat.h.jj 2006-02-12 22:29:08.000000000 +0100 ++++ libc/include/sys/stat.h 2006-11-06 21:07:01.000000000 +0100 +@@ -19,13 +19,13 @@ hidden_proto (__lxstat64) + hidden_proto (__xstat) + hidden_proto (__xstat64) + #endif +-extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) ++__extern_inline int __stat (__const char *__path, struct stat *__statbuf) + { + return __xstat (_STAT_VER, __path, __statbuf); + } + libc_hidden_proto (__xmknod) +-extern __inline__ int __mknod (__const char *__path, __mode_t __mode, +- __dev_t __dev) ++__extern_inline int __mknod (__const char *__path, __mode_t __mode, ++ __dev_t __dev) + { + return __xmknod (_MKNOD_VER, __path, __mode, &__dev); + } +--- libc/stdlib/stdlib.h.jj 2006-10-31 23:05:34.000000000 +0100 ++++ libc/stdlib/stdlib.h 2006-11-06 21:16:09.000000000 +0100 +@@ -324,18 +324,18 @@ extern unsigned long long int __strtoull + /* Define inline functions which call the internal entry points. */ + + __BEGIN_NAMESPACE_STD +-extern __inline double ++__extern_inline double + __NTH (strtod (__const char *__restrict __nptr, char **__restrict __endptr)) + { + return __strtod_internal (__nptr, __endptr, 0); + } +-extern __inline long int ++__extern_inline long int + __NTH (strtol (__const char *__restrict __nptr, char **__restrict __endptr, + int __base)) + { + return __strtol_internal (__nptr, __endptr, __base, 0); + } +-extern __inline unsigned long int ++__extern_inline unsigned long int + __NTH (strtoul (__const char *__restrict __nptr, char **__restrict __endptr, + int __base)) + { +@@ -345,13 +345,13 @@ __END_NAMESPACE_STD + + # ifdef __USE_ISOC99 + __BEGIN_NAMESPACE_C99 +-extern __inline float ++__extern_inline float + __NTH (strtof (__const char *__restrict __nptr, char **__restrict __endptr)) + { + return __strtof_internal (__nptr, __endptr, 0); + } + # ifndef __LDBL_COMPAT +-extern __inline long double ++__extern_inline long double + __NTH (strtold (__const char *__restrict __nptr, char **__restrict __endptr)) + { + return __strtold_internal (__nptr, __endptr, 0); +@@ -361,13 +361,13 @@ __END_NAMESPACE_C99 + # endif + + # ifdef __USE_BSD +-__extension__ extern __inline long long int ++__extension__ __extern_inline long long int + __NTH (strtoq (__const char *__restrict __nptr, char **__restrict __endptr, + int __base)) + { + return __strtoll_internal (__nptr, __endptr, __base, 0); + } +-__extension__ extern __inline unsigned long long int ++__extension__ __extern_inline unsigned long long int + __NTH (strtouq (__const char *__restrict __nptr, char **__restrict __endptr, + int __base)) + { +@@ -377,13 +377,13 @@ __NTH (strtouq (__const char *__restrict + + # if defined __USE_MISC || defined __USE_ISOC99 + __BEGIN_NAMESPACE_C99 +-__extension__ extern __inline long long int ++__extension__ __extern_inline long long int + __NTH (strtoll (__const char *__restrict __nptr, char **__restrict __endptr, + int __base)) + { + return __strtoll_internal (__nptr, __endptr, __base, 0); + } +-__extension__ extern __inline unsigned long long int ++__extension__ __extern_inline unsigned long long int + __NTH (strtoull (__const char * __restrict __nptr, char **__restrict __endptr, + int __base)) + { +@@ -393,17 +393,17 @@ __END_NAMESPACE_C99 + # endif + + __BEGIN_NAMESPACE_STD +-extern __inline double ++__extern_inline double + __NTH (atof (__const char *__nptr)) + { + return strtod (__nptr, (char **) NULL); + } +-extern __inline int ++__extern_inline int + __NTH (atoi (__const char *__nptr)) + { + return (int) strtol (__nptr, (char **) NULL, 10); + } +-extern __inline long int ++__extern_inline long int + __NTH (atol (__const char *__nptr)) + { + return strtol (__nptr, (char **) NULL, 10); +@@ -412,7 +412,7 @@ __END_NAMESPACE_STD + + # if defined __USE_MISC || defined __USE_ISOC99 + __BEGIN_NAMESPACE_C99 +-__extension__ extern __inline long long int ++__extension__ __extern_inline long long int + __NTH (atoll (__const char *__nptr)) + { + return strtoll (__nptr, (char **) NULL, 10); +--- libc/stdlib/bits/stdlib.h.jj 2005-08-22 17:06:07.000000000 +0200 ++++ libc/stdlib/bits/stdlib.h 2006-11-07 11:18:39.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Checking macros for stdlib functions. +- Copyright (C) 2005 Free Software Foundation, Inc. ++ Copyright (C) 2005, 2006 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 +@@ -28,7 +28,7 @@ extern char *__REDIRECT_NTH (__realpath_ + (__const char *__restrict __name, + char *__restrict __resolved), realpath) __wur; + +-extern __always_inline __wur char * ++__extern_always_inline __wur char * + __NTH (realpath (__const char *__restrict __name, char *__restrict __resolved)) + { + if (__bos (__resolved) != (size_t) -1) +@@ -44,7 +44,7 @@ extern int __REDIRECT_NTH (__ptsname_r_a + size_t __buflen), ptsname_r) + __nonnull ((2)); + +-extern __always_inline int ++__extern_always_inline int + __NTH (ptsname_r (int __fd, char *__buf, size_t __buflen)) + { + if (__bos (__buf) != (size_t) -1 +@@ -59,7 +59,7 @@ extern int __wctomb_chk (char *__s, wcha + extern int __REDIRECT_NTH (__wctomb_alias, (char *__s, wchar_t __wchar), + wctomb) __wur; + +-extern __always_inline __wur int ++__extern_always_inline __wur int + __NTH (wctomb (char *__s, wchar_t __wchar)) + { + /* We would have to include to get a definition of MB_LEN_MAX. +@@ -83,7 +83,7 @@ extern size_t __REDIRECT_NTH (__mbstowcs + __const char *__restrict __src, + size_t __len), mbstowcs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src, + size_t __len)) + { +@@ -104,7 +104,7 @@ extern size_t __REDIRECT_NTH (__wcstombs + __const wchar_t *__restrict __src, + size_t __len), wcstombs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src, + size_t __len)) + { + --- libc/stdlib/gmp.h.jj 2002-08-27 00:39:44.000000000 +0200 ++++ libc/stdlib/gmp.h 2006-11-07 15:02:06.000000000 +0100 +@@ -1,6 +1,6 @@ + /* gmp.h -- Definitions for GNU multiple precision functions. + +-Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ++Copyright (C) 1991, 1993, 1994, 1995, 1996, 2006 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -21,6 +21,8 @@ MA 02111-1307, USA. */ + + #ifndef __GMP_H__ + ++#include ++ + #ifndef __GNU_MP__ + #define __GNU_MP__ 2 + #define __need_size_t +@@ -41,7 +43,7 @@ MA 02111-1307, USA. */ + + #ifndef _EXTERN_INLINE + #ifdef __GNUC__ +-#define _EXTERN_INLINE extern __inline__ ++#define _EXTERN_INLINE __extern_inline + #else + #define _EXTERN_INLINE static + #endif +--- libc/ctype/ctype.h.jj 2004-09-08 00:23:45.000000000 +0200 ++++ libc/ctype/ctype.h 2006-11-07 11:18:56.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 ++/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004,2006 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -187,13 +187,13 @@ __exctype (_tolower); + # endif + + # ifdef __USE_EXTERN_INLINES +-extern __inline int ++__extern_inline int + __NTH (tolower (int __c)) + { + return __c >= -128 && __c < 256 ? (*__ctype_tolower_loc ())[__c] : __c; + } + +-extern __inline int ++__extern_inline int + __NTH (toupper (int __c)) + { + return __c >= -128 && __c < 256 ? (*__ctype_toupper_loc ())[__c] : __c; +--- libc/nptl/sysdeps/pthread/bits/libc-lock.h.jj 2006-10-24 10:14:03.000000000 +0200 ++++ libc/nptl/sysdeps/pthread/bits/libc-lock.h 2006-11-07 10:45:52.000000000 +0100 +@@ -1,5 +1,6 @@ + /* libc-internal interface for mutex locks. NPTL version. +- Copyright (C) 1996-2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++ Copyright (C) 1996-2001, 2002, 2003, 2005, 2006 ++ 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 +@@ -408,7 +409,7 @@ extern void _pthread_cleanup_pop_restore + + + /* Normal cleanup handling, based on C cleanup attribute. */ +-extern __inline void ++__extern_inline void + __libc_cleanup_routine (struct __pthread_cleanup_frame *f) + { + if (f->__do_it) +--- libc/nptl/sysdeps/pthread/pthread.h.jj 2006-06-05 01:59:07.000000000 +0200 ++++ libc/nptl/sysdeps/pthread/pthread.h 2006-11-07 10:49:27.000000000 +0100 +@@ -572,7 +572,7 @@ class __pthread_cleanup_class + function the compiler is free to decide inlining the change when + needed or fall back on the copy which must exist somewhere + else. */ +-extern __inline void ++__extern_inline void + __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) + { + if (__frame->__do_it) +@@ -1103,7 +1103,7 @@ extern int pthread_atfork (void (*__prep + + #ifdef __USE_EXTERN_INLINES + /* Optimizations. */ +-extern __inline int ++__extern_inline int + __NTH (pthread_equal (pthread_t __thread1, pthread_t __thread2)) + { + return __thread1 == __thread2; +--- libc/nptl/sysdeps/pthread/allocalim.h.jj 2006-05-02 08:16:07.000000000 +0200 ++++ libc/nptl/sysdeps/pthread/allocalim.h 2006-11-07 10:46:28.000000000 +0100 +@@ -21,8 +21,7 @@ + #include + + +-extern int +-__always_inline ++__extern_always_inline int + __libc_use_alloca (size_t size) + { + return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) +--- libc/nptl/sysdeps/pthread/gai_misc.h.jj 2006-09-05 17:23:12.000000000 +0200 ++++ libc/nptl/sysdeps/pthread/gai_misc.h 2006-11-06 21:17:39.000000000 +0100 +@@ -76,7 +76,7 @@ + #define gai_start_notify_thread __gai_start_notify_thread + #define gai_create_helper_thread __gai_create_helper_thread + +-extern inline void ++__extern_inline void + __gai_start_notify_thread (void) + { + sigset_t ss; +@@ -85,7 +85,7 @@ __gai_start_notify_thread (void) + INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); + } + +-extern inline int ++__extern_inline int + __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), + void *arg) + { +--- libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h.jj 2006-03-02 18:32:45.000000000 +0100 ++++ libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h 2006-11-06 21:18:34.000000000 +0100 +@@ -27,7 +27,7 @@ + # define aio_start_notify_thread __aio_start_notify_thread + # define aio_create_helper_thread __aio_create_helper_thread + +-extern inline void ++__extern_inline void + __aio_start_notify_thread (void) + { + sigset_t ss; +@@ -36,7 +36,7 @@ __aio_start_notify_thread (void) + INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); + } + +-extern inline int ++__extern_inline int + __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), + void *arg) + { +--- libc/resolv/gai_misc.c.jj 2006-08-03 10:01:53.000000000 +0200 ++++ libc/resolv/gai_misc.c 2006-11-07 10:49:55.000000000 +0100 +@@ -30,7 +30,7 @@ + #ifndef gai_create_helper_thread + # define gai_create_helper_thread __gai_create_helper_thread + +-extern inline int ++__extern_inline int + __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), + void *arg) + { +--- libc/bits/mathinline.h.jj 1997-10-13 05:53:18.000000000 +0200 ++++ libc/bits/mathinline.h 2006-11-07 10:51:05.000000000 +0100 +@@ -1,6 +1,6 @@ + /* This file should provide inline versions of math functions. + +- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. ++ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. + + This file should define __MATH_INLINES if functions are actually defined as + inlines. */ +--- libc/bits/string.h.jj 1997-10-13 05:53:19.000000000 +0200 ++++ libc/bits/string.h 2006-11-07 10:50:54.000000000 +0100 +@@ -1,6 +1,6 @@ + /* This file should provide inline versions of string functions. + +- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. ++ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. + + This file should define __STRING_INLINES if functions are actually defined + as inlines. */ +--- libc/bits/sigset.h.jj 2001-07-06 06:55:50.000000000 +0200 ++++ libc/bits/sigset.h 2006-11-07 11:19:08.000000000 +0100 +@@ -1,5 +1,6 @@ + /* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. +- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 ++ 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 +@@ -38,7 +39,7 @@ typedef unsigned long int __sigset_t; + #define _SIGSET_H_fns 1 + + #ifndef _EXTERN_INLINE +-# define _EXTERN_INLINE extern __inline ++# define _EXTERN_INLINE __extern_inline + #endif + + /* Return a mask that includes SIG only. The cast to `sigset_t' avoids +--- libc/misc/sys/cdefs.h.jj 2006-01-14 21:14:36.000000000 +0100 ++++ libc/misc/sys/cdefs.h 2006-11-06 21:00:45.000000000 +0100 +@@ -279,6 +279,18 @@ + # define __always_inline __inline + #endif + ++/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 ++ inline semantics. */ ++#if __GNUC_PREREQ (4,3) && defined (__STDC_VERSION__) \ ++ && __STDC_VERSION__ >= 199901L ++# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) ++# define __extern_always_inline \ ++ extern __always_inline __inline __attribute__ ((__gnu_inline__)) ++#else ++# define __extern_inline extern __inline ++# define __extern_always_inline extern __always_inline ++#endif ++ + /* It is possible to compile containing GCC extensions even if GCC is + run in pedantic mode if the uses are carefully marked using the + `__extension__' keyword. But this is not generally available before +--- libc/libio/bits/stdio.h.jj 2004-09-08 00:23:44.000000000 +0200 ++++ libc/libio/bits/stdio.h 2006-11-06 21:23:07.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Optimizing macros and inline functions for stdio functions. +- Copyright (C) 1998, 2000, 2001, 2004 Free Software Foundation, Inc. ++ Copyright (C) 1998, 2000, 2001, 2004, 2006 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 +@@ -24,7 +24,7 @@ + #ifdef __cplusplus + # define __STDIO_INLINE inline + #else +-# define __STDIO_INLINE extern __inline ++# define __STDIO_INLINE __extern_inline + #endif + + +--- libc/libio/bits/stdio2.h.jj 2005-03-19 01:14:58.000000000 +0100 ++++ libc/libio/bits/stdio2.h 2006-11-06 21:22:33.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Checking macros for stdio functions. +- Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006 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 +@@ -75,7 +75,7 @@ extern int __vprintf_chk (int __flag, __ + extern char *__gets_chk (char *__str, size_t) __wur; + extern char *__REDIRECT (__gets_alias, (char *__str), gets) __wur; + +-extern __always_inline __wur char * ++__extern_always_inline __wur char * + gets (char *__str) + { + if (__bos (__str) != (size_t) -1) +@@ -89,7 +89,7 @@ extern char *__REDIRECT (__fgets_alias, + (char *__restrict __s, int __n, + FILE *__restrict __stream), fgets) __wur; + +-extern __always_inline __wur char * ++__extern_always_inline __wur char * + fgets (char *__restrict __s, int __n, FILE *__restrict __stream) + { + if (__bos (__s) != (size_t) -1 +@@ -105,7 +105,7 @@ extern char *__REDIRECT (__fgets_unlocke + (char *__restrict __s, int __n, + FILE *__restrict __stream), fgets_unlocked) __wur; + +-extern __always_inline __wur char * ++__extern_always_inline __wur char * + fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) + { + if (__bos (__s) != (size_t) -1 +--- libc/argp/argp.h.jj 2006-04-22 17:08:26.000000000 +0200 ++++ libc/argp/argp.h 2006-11-06 21:24:08.000000000 +0100 +@@ -558,7 +558,7 @@ extern void *__argp_input (__const struc + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# define ARGP_EI __extern_inline + # endif + + ARGP_EI void +--- libc/argp/argp-fmtstream.h.jj 2005-09-27 23:45:41.000000000 +0200 ++++ libc/argp/argp-fmtstream.h 2006-11-07 11:19:12.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Word-wrapping and line-truncating streams. +- Copyright (C) 1997 Free Software Foundation, Inc. ++ Copyright (C) 1997, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Written by Miles Bader . + +@@ -203,7 +203,7 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI +-#define ARGP_FS_EI extern inline ++#define ARGP_FS_EI __extern_inline + #endif + + ARGP_FS_EI size_t +--- libc/locale/programs/locfile.c.jj 2006-05-10 04:12:39.000000000 +0200 ++++ libc/locale/programs/locfile.c 2006-11-07 15:13:20.000000000 +0100 +@@ -33,6 +33,11 @@ + #include "locfile.h" + #include "simple-hash.h" + ++/* This prototype is needed to export locfile_hash from this object ++ when using ISO C99 inline semantics. */ ++struct keyword_t; ++const struct keyword_t *locfile_hash (const char *str, unsigned int len); ++ + #include "locfile-kw.h" + + +--- libc/locale/programs/charmap.c.jj 2006-08-19 19:50:52.000000000 +0200 ++++ libc/locale/programs/charmap.c 2006-11-07 15:11:05.000000000 +0100 +@@ -35,6 +35,10 @@ + + #include + ++/* This prototype is needed to export charmap_hash from this object ++ when using ISO C99 inline semantics. */ ++struct keyword_t; ++const struct keyword_t *charmap_hash (const char *str, unsigned int len); + + /* Define the lookup function. */ + #include "charmap-kw.h" +--- libc/io/sys/stat.h.jj 2006-01-06 13:14:05.000000000 +0100 ++++ libc/io/sys/stat.h 2006-11-06 21:27:03.000000000 +0100 +@@ -430,28 +430,28 @@ extern int __xmknodat (int __ver, int __ + #if defined __GNUC__ && __GNUC__ >= 2 + /* Inlined versions of the real stat and mknod functions. */ + +-extern __inline__ int ++__extern_inline int + __NTH (stat (__const char *__path, struct stat *__statbuf)) + { + return __xstat (_STAT_VER, __path, __statbuf); + } + + # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +-extern __inline__ int ++__extern_inline int + __NTH (lstat (__const char *__path, struct stat *__statbuf)) + { + return __lxstat (_STAT_VER, __path, __statbuf); + } + # endif + +-extern __inline__ int ++__extern_inline int + __NTH (fstat (int __fd, struct stat *__statbuf)) + { + return __fxstat (_STAT_VER, __fd, __statbuf); + } + + # ifdef __USE_ATFILE +-extern __inline__ int ++__extern_inline int + __NTH (fstatat (int __fd, __const char *__filename, struct stat *__statbuf, + int __flag)) + { +@@ -460,7 +460,7 @@ __NTH (fstatat (int __fd, __const char * + # endif + + # if defined __USE_MISC || defined __USE_BSD +-extern __inline__ int ++__extern_inline int + __NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev)) + { + return __xmknod (_MKNOD_VER, __path, __mode, &__dev); +@@ -468,7 +468,7 @@ __NTH (mknod (__const char *__path, __mo + # endif + + # ifdef __USE_ATFILE +-extern __inline__ int ++__extern_inline int + __NTH (mknodat (int __fd, __const char *__path, __mode_t __mode, + __dev_t __dev)) + { +@@ -479,28 +479,28 @@ __NTH (mknodat (int __fd, __const char * + # if defined __USE_LARGEFILE64 \ + && (! defined __USE_FILE_OFFSET64 \ + || (defined __REDIRECT_NTH && defined __OPTIMIZE__)) +-extern __inline__ int ++__extern_inline int + __NTH (stat64 (__const char *__path, struct stat64 *__statbuf)) + { + return __xstat64 (_STAT_VER, __path, __statbuf); + } + + # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +-extern __inline__ int ++__extern_inline int + __NTH (lstat64 (__const char *__path, struct stat64 *__statbuf)) + { + return __lxstat64 (_STAT_VER, __path, __statbuf); + } + # endif + +-extern __inline__ int ++__extern_inline int + __NTH (fstat64 (int __fd, struct stat64 *__statbuf)) + { + return __fxstat64 (_STAT_VER, __fd, __statbuf); + } + + # ifdef __USE_GNU +-extern __inline__ int ++__extern_inline int + __NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf, + int __flag)) + { +--- libc/wcsmbs/wchar.h.jj 2006-09-27 17:56:30.000000000 +0200 ++++ libc/wcsmbs/wchar.h 2006-11-06 21:28:28.000000000 +0100 +@@ -326,19 +326,19 @@ __END_NAMESPACE_C99 + locales must use ASCII encoding for the values in the ASCII range + and because the wchar_t encoding is always ISO 10646. */ + extern wint_t __btowc_alias (int __c) __asm ("btowc"); +-extern __inline wint_t ++__extern_inline wint_t + __NTH (btowc (int __c)) + { return (__builtin_constant_p (__c) && __c >= '\0' && __c <= '\x7f' + ? (wint_t) __c : __btowc_alias (__c)); } + + extern int __wctob_alias (wint_t __c) __asm ("wctob"); +-extern __inline int ++__extern_inline int + __NTH (wctob (wint_t __wc)) + { return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f' + ? (int) __wc : __wctob_alias (__wc)); } + # endif + +-extern __inline size_t ++__extern_inline size_t + __NTH (mbrlen (__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps)) + { return (__ps != NULL +@@ -548,38 +548,38 @@ extern unsigned long long int __wcstoull + /* Define inline functions which call the internal entry points. */ + __BEGIN_NAMESPACE_C99 + +-extern __inline double ++__extern_inline double + __NTH (wcstod (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) + { return __wcstod_internal (__nptr, __endptr, 0); } +-extern __inline long int ++__extern_inline long int + __NTH (wcstol (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) + { return __wcstol_internal (__nptr, __endptr, __base, 0); } +-extern __inline unsigned long int ++__extern_inline unsigned long int + __NTH (wcstoul (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) + { return __wcstoul_internal (__nptr, __endptr, __base, 0); } + __END_NAMESPACE_C99 + + # ifdef __USE_GNU +-extern __inline float ++__extern_inline float + __NTH (wcstof (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) + { return __wcstof_internal (__nptr, __endptr, 0); } + # ifndef __LDBL_COMPAT +-extern __inline long double ++__extern_inline long double + __NTH (wcstold (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) + { return __wcstold_internal (__nptr, __endptr, 0); } + # endif + __extension__ +-extern __inline long long int ++__extern_inline long long int + __NTH (wcstoq (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) + { return __wcstoll_internal (__nptr, __endptr, __base, 0); } + __extension__ +-extern __inline unsigned long long int ++__extern_inline unsigned long long int + __NTH (wcstouq (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) + { return __wcstoull_internal (__nptr, __endptr, __base, 0); } +--- libc/wcsmbs/bits/wchar2.h.jj 2006-01-14 13:09:47.000000000 +0100 ++++ libc/wcsmbs/bits/wchar2.h 2006-11-06 21:29:19.000000000 +0100 +@@ -30,7 +30,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemcp + __const wchar_t *__restrict __s2, size_t __n), + wmemcpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wmemcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, + size_t __n)) + { +@@ -46,7 +46,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemmo + __const wchar_t *__s2, + size_t __n), wmemmove); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wmemmove (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, + size_t __n)) + { +@@ -65,7 +65,7 @@ extern wchar_t *__REDIRECT_NTH (__wmempc + __const wchar_t *__restrict __s2, + size_t __n), wmempcpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wmempcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, + size_t __n)) + { +@@ -81,7 +81,7 @@ extern wchar_t *__wmemset_chk (wchar_t * + extern wchar_t *__REDIRECT_NTH (__wmemset_alias, (wchar_t *__s, wchar_t __c, + size_t __n), wmemset); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wmemset (wchar_t *__restrict __s, wchar_t __c, size_t __n)) + { + if (__bos0 (__s) != (size_t) -1) +@@ -97,7 +97,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscpy + (wchar_t *__restrict __dest, + __const wchar_t *__restrict __src), wcscpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcscpy (wchar_t *__dest, __const wchar_t *__src)) + { + if (__bos (__dest) != (size_t) -1) +@@ -112,7 +112,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpcpy + __const wchar_t *__src), + wcpcpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcpcpy (wchar_t *__dest, __const wchar_t *__src)) + { + if (__bos (__dest) != (size_t) -1) +@@ -129,7 +129,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsncp + __const wchar_t *__restrict __src, + size_t __n), wcsncpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcsncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) + { + if (__bos (__dest) != (size_t) -1 +@@ -148,7 +148,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpncp + __const wchar_t *__restrict __src, + size_t __n), wcpncpy); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) + { + if (__bos (__dest) != (size_t) -1 +@@ -166,7 +166,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscat + (wchar_t *__restrict __dest, + __const wchar_t *__restrict __src), wcscat); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcscat (wchar_t *__dest, __const wchar_t *__src)) + { + if (__bos (__dest) != (size_t) -1) +@@ -183,7 +183,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsnca + __const wchar_t *__restrict __src, + size_t __n), wcsncat); + +-extern __always_inline wchar_t * ++__extern_always_inline wchar_t * + __NTH (wcsncat (wchar_t *__dest, __const wchar_t *__src, size_t __n)) + { + if (__bos (__dest) != (size_t) -1) +@@ -246,7 +246,7 @@ extern wchar_t *__REDIRECT (__fgetws_ali + (wchar_t *__restrict __s, int __n, + __FILE *__restrict __stream), fgetws) __wur; + +-extern __always_inline __wur wchar_t * ++__extern_always_inline __wur wchar_t * + fgetws (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) + { + if (__bos (__s) != (size_t) -1 +@@ -264,7 +264,7 @@ extern wchar_t *__REDIRECT (__fgetws_unl + __FILE *__restrict __stream), fgetws_unlocked) + __wur; + +-extern __always_inline __wur wchar_t * ++__extern_always_inline __wur wchar_t * + fgetws_unlocked (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) + { + if (__bos (__s) != (size_t) -1 +@@ -281,7 +281,7 @@ extern size_t __REDIRECT_NTH (__wcrtomb_ + (char *__restrict __s, wchar_t __wchar, + mbstate_t *__restrict __ps), wcrtomb) __wur; + +-extern __always_inline __wur size_t ++__extern_always_inline __wur size_t + __NTH (wcrtomb (char *__s, wchar_t __wchar, mbstate_t *__ps)) + { + /* We would have to include to get a definition of MB_LEN_MAX. +@@ -307,7 +307,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowc + size_t __len, mbstate_t *__restrict __ps), + mbsrtowcs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)) + { +@@ -330,7 +330,7 @@ extern size_t __REDIRECT_NTH (__wcsrtomb + size_t __len, mbstate_t *__restrict __ps), + wcsrtombs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (wcsrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)) + { +@@ -352,7 +352,7 @@ extern size_t __REDIRECT_NTH (__mbsnrtow + size_t __len, mbstate_t *__restrict __ps), + mbsnrtowcs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (mbsnrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, + size_t __nmc, size_t __len, mbstate_t *__restrict __ps)) + { +@@ -376,7 +376,7 @@ extern size_t __REDIRECT_NTH (__wcsnrtom + size_t __nwc, size_t __len, + mbstate_t *__restrict __ps), wcsnrtombs); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (wcsnrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, + size_t __nwc, size_t __len, mbstate_t *__restrict __ps)) + { +--- libc/socket/bits/socket2.h.jj 2005-08-08 21:00:53.000000000 +0200 ++++ libc/socket/bits/socket2.h 2006-11-06 21:29:59.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Checking macros for socket functions. +- Copyright (C) 2005 Free Software Foundation, Inc. ++ Copyright (C) 2005, 2006 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 +@@ -26,7 +26,7 @@ extern ssize_t __recv_chk (int __fd, voi + extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, + int __flags), recv); + +-extern __always_inline ssize_t ++__extern_always_inline ssize_t + recv (int __fd, void *__buf, size_t __n, int __flags) + { + if (__bos0 (__buf) != (size_t) -1 +@@ -44,7 +44,7 @@ extern ssize_t __REDIRECT (__recvfrom_al + int __flags, __SOCKADDR_ARG __addr, + socklen_t *__restrict __addr_len), recvfrom); + +-extern __always_inline ssize_t ++__extern_always_inline ssize_t + recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags, + __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) + { +--- libc/posix/bits/unistd.h.jj 2006-08-24 08:47:31.000000000 +0200 ++++ libc/posix/bits/unistd.h 2006-11-06 21:30:39.000000000 +0100 +@@ -26,7 +26,7 @@ extern ssize_t __read_chk (int __fd, voi + extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, + size_t __nbytes), read) __wur; + +-extern __always_inline __wur ssize_t ++__extern_always_inline __wur ssize_t + read (int __fd, void *__buf, size_t __nbytes) + { + if (__bos0 (__buf) != (size_t) -1 +@@ -48,7 +48,7 @@ extern ssize_t __REDIRECT (__pread64_ali + __off64_t __offset), pread64) __wur; + + # ifndef __USE_FILE_OFFSET64 +-extern __always_inline __wur ssize_t ++__extern_always_inline __wur ssize_t + pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) + { + if (__bos0 (__buf) != (size_t) -1 +@@ -57,7 +57,7 @@ pread (int __fd, void *__buf, size_t __n + return __pread_alias (__fd, __buf, __nbytes, __offset); + } + # else +-extern __always_inline __wur ssize_t ++__extern_always_inline __wur ssize_t + pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) + { + if (__bos0 (__buf) != (size_t) -1 +@@ -68,7 +68,7 @@ pread (int __fd, void *__buf, size_t __n + # endif + + # ifdef __USE_LARGEFILE64 +-extern __always_inline __wur ssize_t ++__extern_always_inline __wur ssize_t + pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) + { + if (__bos0 (__buf) != (size_t) -1 +@@ -89,7 +89,7 @@ extern ssize_t __REDIRECT_NTH (__readlin + char *__restrict __buf, size_t __len), readlink) + __nonnull ((1, 2)) __wur; + +-extern __always_inline __nonnull ((1, 2)) __wur ssize_t ++__extern_always_inline __nonnull ((1, 2)) __wur ssize_t + __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, + size_t __len)) + { +@@ -111,7 +111,7 @@ extern ssize_t __REDIRECT_NTH (__readlin + readlinkat) + __nonnull ((2, 3)) __wur; + +-extern __always_inline __nonnull ((2, 3)) __wur ssize_t ++__extern_always_inline __nonnull ((2, 3)) __wur ssize_t + __NTH (readlinkat (int __fd, __const char *__restrict __path, + char *__restrict __buf, size_t __len)) + { +@@ -127,7 +127,7 @@ extern char *__getcwd_chk (char *__buf, + extern char *__REDIRECT_NTH (__getcwd_alias, + (char *__buf, size_t __size), getcwd) __wur; + +-extern __always_inline __wur char * ++__extern_always_inline __wur char * + __NTH (getcwd (char *__buf, size_t __size)) + { + if (__bos (__buf) != (size_t) -1 +@@ -142,7 +142,7 @@ extern char *__getwd_chk (char *__buf, s + extern char *__REDIRECT_NTH (__getwd_alias, (char *__buf), getwd) + __nonnull ((1)) __wur; + +-extern __always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * ++__extern_always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * + __NTH (getwd (char *__buf)) + { + if (__bos (__buf) != (size_t) -1) +@@ -156,7 +156,7 @@ extern size_t __confstr_chk (int __name, + extern size_t __REDIRECT_NTH (__confstr_alias, (int __name, char *__buf, + size_t __len), confstr); + +-extern __always_inline size_t ++__extern_always_inline size_t + __NTH (confstr (int __name, char *__buf, size_t __len)) + { + if (__bos (__buf) != (size_t) -1 +@@ -171,7 +171,7 @@ extern int __getgroups_chk (int __size, + extern int __REDIRECT_NTH (__getgroups_alias, (int __size, __gid_t __list[]), + getgroups) __wur; + +-extern __always_inline int ++__extern_always_inline int + __NTH (getgroups (int __size, __gid_t __list[])) + { + if (__bos (__list) != (size_t) -1 +@@ -188,7 +188,7 @@ extern int __REDIRECT_NTH (__ttyname_r_a + size_t __buflen), ttyname_r) + __nonnull ((2)); + +-extern __always_inline int ++__extern_always_inline int + __NTH (ttyname_r (int __fd, char *__buf, size_t __buflen)) + { + if (__bos (__buf) != (size_t) -1 +@@ -204,7 +204,7 @@ extern int __getlogin_r_chk (char *__buf + extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen), + getlogin_r) __nonnull ((1)); + +-extern __always_inline int ++__extern_always_inline int + getlogin_r (char *__buf, size_t __buflen) + { + if (__bos (__buf) != (size_t) -1 +@@ -221,7 +221,7 @@ extern int __gethostname_chk (char *__bu + extern int __REDIRECT_NTH (__gethostname_alias, (char *__buf, size_t __buflen), + gethostname) __nonnull ((1)); + +-extern __always_inline int ++__extern_always_inline int + __NTH (gethostname (char *__buf, size_t __buflen)) + { + if (__bos (__buf) != (size_t) -1 +@@ -239,7 +239,7 @@ extern int __REDIRECT_NTH (__getdomainna + size_t __buflen), + getdomainname) __nonnull ((1)) __wur; + +-extern __always_inline int ++__extern_always_inline int + __NTH (getdomainname (char *__buf, size_t __buflen)) + { + if (__bos (__buf) != (size_t) -1 +--- libc/string/bits/string3.h.jj 2005-08-08 21:02:31.000000000 +0200 ++++ libc/string/bits/string3.h 2006-11-07 11:19:17.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++/* Copyright (C) 2004, 2005, 2006 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 +@@ -151,7 +151,7 @@ extern char *__REDIRECT_NTH (__stpncpy_a + __const char *__src, + size_t __n), stpncpy); + +-extern __always_inline char * ++__extern_always_inline char * + __NTH (stpncpy (char *__dest, __const char *__src, size_t __n)) + { + if (__bos (__dest) != (size_t) -1 +--- libc/string/bits/string2.h.jj 2004-05-28 08:39:13.000000000 +0200 ++++ libc/string/bits/string2.h 2006-11-07 11:19:24.000000000 +0100 +@@ -0,0 +1,18 @@ ++/* DO NOT EDIT THIS FILE. ++ ++ It has been auto-edited by fixincludes from: ++ ++ "fixinc/tests/inc/bits/string2.h" ++ ++ This had to be done to correct non-standard usages in the ++ original, manufacturer supplied header file. */ ++ ++ ++ ++#if defined( GLIBC_C99_INLINE_3_CHECK ) ++# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L ++# define __STRING_INLINE inline ++# else ++# define __STRING_INLINE extern __inline ++# endif ++#endif /* GLIBC_C99_INLINE_3_CHECK */ +@@ -1,5 +1,5 @@ + /* Machine-independant string function optimizations. +- Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc. ++ Copyright (C) 1997-2003, 2004, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + +@@ -43,7 +43,7 @@ + # ifdef __cplusplus + # define __STRING_INLINE inline + # else +-# define __STRING_INLINE extern __inline ++# define __STRING_INLINE __extern_inline + # endif + #endif + +--- libc/string/argz.h.jj 2004-09-08 00:23:43.000000000 +0200 ++++ libc/string/argz.h 2006-11-07 11:19:33.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Routines for dealing with '\0' separated arg vectors. +- Copyright (C) 1995,96,97,98,99,2000,2004 Free Software Foundation, Inc. ++ Copyright (C) 1995,96,97,98,99,2000,2004,2006 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 +@@ -160,7 +160,7 @@ extern char *argz_next (__const char *__ + __const char *__restrict __entry) __THROW; + + #ifdef __USE_EXTERN_INLINES +-extern inline char * ++__extern_inline char * + __NTH (__argz_next (__const char *__argz, size_t __argz_len, + __const char *__entry)) + { +@@ -174,7 +174,7 @@ __NTH (__argz_next (__const char *__argz + else + return __argz_len > 0 ? (char *) __argz : 0; + } +-extern inline char * ++__extern_inline char * + __NTH (argz_next (__const char *__argz, size_t __argz_len, + __const char *__entry)) + { +--- libc/math/bits/cmathcalls.h.jj 2001-07-06 06:55:35.000000000 +0200 ++++ libc/math/bits/cmathcalls.h 2006-11-07 11:19:39.000000000 +0100 +@@ -1,6 +1,6 @@ + /* Prototype declarations for complex math functions; + helper file for . +- Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. ++ Copyright (C) 1997, 1998, 2001, 2006 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 +@@ -135,21 +135,21 @@ __MATHDECL (_Mdouble_,creal, (_Mdouble_c + #if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__ + + /* Imaginary part of Z. */ +-extern __inline _Mdouble_ ++__extern_inline _Mdouble_ + __MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW + { + return __imag__ __z; + } + + /* Real part of Z. */ +-extern __inline _Mdouble_ ++__extern_inline _Mdouble_ + __MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW + { + return __real__ __z; + } + + /* Complex conjugate of Z. */ +-extern __inline _Mdouble_complex_ ++__extern_inline _Mdouble_complex_ + __MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW + { + return __extension__ ~__z; +--- libc/math/math_private.h.jj 2005-11-21 16:43:03.000000000 +0100 ++++ libc/math/math_private.h 2006-11-06 21:33:45.000000000 +0100 +@@ -192,7 +192,7 @@ extern int __kernel_rem_pio2 (double* + extern double __copysign (double x, double __y); + + #if __GNUC_PREREQ (4, 0) +-extern inline double __copysign (double x, double y) ++__extern_inline double __copysign (double x, double y) + { return __builtin_copysign (x, y); } + #endif + +@@ -239,7 +239,7 @@ extern int __kernel_rem_pio2f (float*, + extern float __copysignf (float x, float __y); + + #if __GNUC_PREREQ (4, 0) +-extern inline float __copysignf (float x, float y) ++__extern_inline float __copysignf (float x, float y) + { return __builtin_copysignf (x, y); } + #endif + +@@ -307,7 +307,7 @@ extern long double __logbl (long double + extern long double __significandl (long double x); + + #if __GNUC_PREREQ (4, 0) +-extern inline long double __copysignl (long double x, long double y) ++__extern_inline long double __copysignl (long double x, long double y) + { return __builtin_copysignl (x, y); } + #endif + +--- libc/hurd/hurd.h.jj 2002-01-02 10:52:20.000000000 +0100 ++++ libc/hurd/hurd.h 2006-11-07 11:19:51.000000000 +0100 +@@ -1,4 +1,5 @@ +-/* Copyright (C) 1993,94,95,96,97,98,99,2001,02 Free Software Foundation, Inc. ++/* Copyright (C) 1993,94,95,96,97,98,99,2001,2002,2006 ++ 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 +@@ -44,7 +45,7 @@ + #include + + #ifndef _HURD_H_EXTERN_INLINE +-#define _HURD_H_EXTERN_INLINE extern __inline ++#define _HURD_H_EXTERN_INLINE __extern_inline + #endif + + _HURD_H_EXTERN_INLINE int +--- libc/hurd/hurd/port.h.jj 2001-07-06 06:54:47.000000000 +0200 ++++ libc/hurd/hurd/port.h 2006-11-07 11:19:58.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Lightweight user references for ports. +- Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1993, 1994, 1995, 1997, 1999, 2006 ++ 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 +@@ -55,7 +56,7 @@ struct hurd_port + + + #ifndef _HURD_PORT_H_EXTERN_INLINE +-#define _HURD_PORT_H_EXTERN_INLINE extern __inline ++#define _HURD_PORT_H_EXTERN_INLINE __extern_inline + #endif + + +--- libc/hurd/hurd/threadvar.h.jj 2002-09-02 09:08:53.000000000 +0200 ++++ libc/hurd/hurd/threadvar.h 2006-11-07 10:54:40.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Internal per-thread variables for the Hurd. +- Copyright (C) 1994,95,97,98,99,2001,02 Free Software Foundation, Inc. ++ Copyright (C) 1994,95,97,98,99,2001,02,06 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 +@@ -74,7 +74,7 @@ enum __hurd_threadvar_index + + + #ifndef _HURD_THREADVAR_H_EXTERN_INLINE +-#define _HURD_THREADVAR_H_EXTERN_INLINE extern __inline ++#define _HURD_THREADVAR_H_EXTERN_INLINE __extern_inline + #endif + + /* Return the location of the value for the per-thread variable with index +--- libc/hurd/hurd/fd.h.jj 2006-03-06 08:59:07.000000000 +0100 ++++ libc/hurd/hurd/fd.h 2006-11-07 10:53:18.000000000 +0100 +@@ -52,7 +52,7 @@ extern struct mutex _hurd_dtable_lock; / + #include + + #ifndef _HURD_FD_H_EXTERN_INLINE +-#define _HURD_FD_H_EXTERN_INLINE extern __inline ++#define _HURD_FD_H_EXTERN_INLINE __extern_inline + #endif + + /* Returns the descriptor cell for FD. If FD is invalid or unused, return +--- libc/hurd/hurd/signal.h.jj 2002-02-18 21:57:11.000000000 +0100 ++++ libc/hurd/hurd/signal.h 2006-11-07 10:54:13.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Implementing POSIX.1 signals under the Hurd. +- Copyright (C) 1993,94,95,96,98,99,2002 Free Software Foundation, Inc. ++ Copyright (C) 1993,94,95,96,98,99,2002,2006 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 +@@ -126,7 +126,7 @@ extern struct hurd_sigstate *_hurd_self_ + __attribute__ ((__const__)); + + #ifndef _HURD_SIGNAL_H_EXTERN_INLINE +-#define _HURD_SIGNAL_H_EXTERN_INLINE extern __inline ++#define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline + #endif + + _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * +--- libc/hurd/hurd/userlink.h.jj 2001-07-06 06:54:47.000000000 +0200 ++++ libc/hurd/hurd/userlink.h 2006-11-07 10:53:37.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Support for chains recording users of a resource; `struct hurd_userlink'. +- Copyright (C) 1994, 1995, 1997, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1995, 1997, 1999, 2006 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 +@@ -71,7 +71,7 @@ struct hurd_userlink + + + #ifndef _HURD_USERLINK_H_EXTERN_INLINE +-#define _HURD_USERLINK_H_EXTERN_INLINE extern __inline ++#define _HURD_USERLINK_H_EXTERN_INLINE __extern_inline + #endif + + +--- libc/sysdeps/mach/alpha/machine-sp.h.jj 2001-07-06 06:55:56.000000000 +0200 ++++ libc/sysdeps/mach/alpha/machine-sp.h 2006-11-07 10:55:42.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific function to return the stack pointer. Alpha version. +- Copyright (C) 1994, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1997, 2006 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 +@@ -23,7 +23,7 @@ + /* Return the current stack pointer. */ + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + _EXTERN_INLINE void * +--- libc/sysdeps/mach/alpha/machine-lock.h.jj 2003-02-26 01:01:15.000000000 +0100 ++++ libc/sysdeps/mach/alpha/machine-lock.h 2006-11-07 11:20:04.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific definition for spin locks. Alpha version. +- Copyright (C) 1994, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1997, 2006 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 +@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ + + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + /* Unlock LOCK. */ +--- libc/sysdeps/mach/i386/machine-lock.h.jj 2001-07-06 06:56:00.000000000 +0200 ++++ libc/sysdeps/mach/i386/machine-lock.h 2006-11-07 10:56:10.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific definition for spin locks. i386 version. +- Copyright (C) 1994, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1997, 2006 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 +@@ -30,7 +30,7 @@ typedef __volatile int __spin_lock_t; + + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + /* Unlock LOCK. */ +--- libc/sysdeps/mach/powerpc/machine-sp.h.jj 2002-08-27 00:39:44.000000000 +0200 ++++ libc/sysdeps/mach/powerpc/machine-sp.h 2006-11-07 10:56:59.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific function to return the stack pointer. PowerPC version. +- Copyright (C) 2001 Free Software Foundation, Inc. ++ Copyright (C) 2001, 2006 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 +@@ -27,7 +27,7 @@ + # ifdef _HURD_THREADVAR_H_EXTERN_INLINE + # define _EXTERN_INLINE _HURD_THREADVAR_H_EXTERN_INLINE + # else +-# define _EXTERN_INLINE extern __inline ++# define _EXTERN_INLINE __extern_inline + # endif + #endif + +--- libc/sysdeps/mach/powerpc/machine-lock.h.jj 2002-02-17 08:13:25.000000000 +0100 ++++ libc/sysdeps/mach/powerpc/machine-lock.h 2006-11-07 10:56:40.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific definition for spin locks. PowerPC version. +- Copyright (C) 1994,97,2002 Free Software Foundation, Inc. ++ Copyright (C) 1994,97,2002,2006 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 +@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ + + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + /* Unlock LOCK. */ +--- libc/sysdeps/alpha/fpu/bits/mathinline.h.jj 2005-02-08 05:37:48.000000000 +0100 ++++ libc/sysdeps/alpha/fpu/bits/mathinline.h 2006-11-07 10:59:08.000000000 +0100 +@@ -1,5 +1,6 @@ + /* Inline math functions for Alpha. +- Copyright (C) 1996, 1997, 1999-2001, 2004 Free Software Foundation, Inc. ++ Copyright (C) 1996, 1997, 1999-2001, 2004, 2006 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by David Mosberger-Tang. + +@@ -25,7 +26,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif + + #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) +--- libc/sysdeps/ia64/fpu/bits/mathinline.h.jj 2004-09-08 23:44:02.000000000 +0200 ++++ libc/sysdeps/ia64/fpu/bits/mathinline.h 2006-11-07 10:59:49.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Inline math functions for ia64. +- Copyright (C) 2004 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2006 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 +@@ -24,7 +24,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif + + #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2 +--- libc/sysdeps/i386/fpu/bits/mathinline.h.jj 2004-09-08 00:23:42.000000000 +0200 ++++ libc/sysdeps/i386/fpu/bits/mathinline.h 2006-11-07 11:00:56.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Inline math functions for i387. +- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 ++ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by John C. Bowman , 1995. +@@ -26,7 +26,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif + + +--- libc/sysdeps/i386/i486/bits/string.h.jj 2004-12-15 21:30:16.000000000 +0100 ++++ libc/sysdeps/i386/i486/bits/string.h 2006-11-07 11:01:34.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Optimized, inlined string functions. i486 version. +- Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004 ++ Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004,2006 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -35,7 +35,7 @@ + # ifdef __cplusplus + # define __STRING_INLINE inline + # else +-# define __STRING_INLINE extern __inline ++# define __STRING_INLINE __extern_inline + # endif + #endif + +--- libc/sysdeps/generic/inttypes.h.jj 2004-09-08 00:23:42.000000000 +0200 ++++ libc/sysdeps/generic/inttypes.h 2006-11-07 11:02:59.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1997-2001, 2004 Free Software Foundation, Inc. ++/* Copyright (C) 1997-2001, 2004, 2006 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 +@@ -330,7 +330,7 @@ extern long int __strtol_internal (__con + int __base, int __group) __THROW; + # define __strtol_internal_defined 1 + # endif +-extern __inline intmax_t ++__extern_inline intmax_t + __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, + int base)) + { +@@ -345,7 +345,7 @@ extern unsigned long int __strtoul_inter + int __base, int __group) __THROW; + # define __strtoul_internal_defined 1 + # endif +-extern __inline uintmax_t ++__extern_inline uintmax_t + __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, + int base)) + { +@@ -359,7 +359,7 @@ extern long int __wcstol_internal (__con + int __base, int __group) __THROW; + # define __wcstol_internal_defined 1 + # endif +-extern __inline intmax_t ++__extern_inline intmax_t + __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, + __gwchar_t **__restrict endptr, int base)) + { +@@ -376,7 +376,7 @@ extern unsigned long int __wcstoul_inter + int __base, int __group) __THROW; + # define __wcstoul_internal_defined 1 + # endif +-extern __inline uintmax_t ++__extern_inline uintmax_t + __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, + __gwchar_t **__restrict endptr, int base)) + { +@@ -393,7 +393,7 @@ extern long long int __strtoll_internal + int __base, int __group) __THROW; + # define __strtoll_internal_defined 1 + # endif +-extern __inline intmax_t ++__extern_inline intmax_t + __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, + int base)) + { +@@ -411,7 +411,7 @@ extern unsigned long long int __strtoull + int __group) __THROW; + # define __strtoull_internal_defined 1 + # endif +-extern __inline uintmax_t ++__extern_inline uintmax_t + __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, + int base)) + { +@@ -427,7 +427,7 @@ extern long long int __wcstoll_internal + int __base, int __group) __THROW; + # define __wcstoll_internal_defined 1 + # endif +-extern __inline intmax_t ++__extern_inline intmax_t + __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, + __gwchar_t **__restrict endptr, int base)) + { +@@ -446,7 +446,7 @@ extern unsigned long long int __wcstoull + int __group) __THROW; + # define __wcstoull_internal_defined 1 + # endif +-extern __inline uintmax_t ++__extern_inline uintmax_t + __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, + __gwchar_t **__restrict endptr, int base)) + { +--- libc/sysdeps/generic/machine-sp.h.jj 2001-07-06 06:55:49.000000000 +0200 ++++ libc/sysdeps/generic/machine-sp.h 2006-11-07 11:06:02.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific function to return the stack pointer. Stub version. +- Copyright (C) 1994, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1997, 2006 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 +@@ -23,7 +23,7 @@ + /* Return the current stack pointer. */ + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + _EXTERN_INLINE void * +--- libc/sysdeps/generic/machine-lock.h.jj 2001-07-06 06:55:49.000000000 +0200 ++++ libc/sysdeps/generic/machine-lock.h 2006-11-07 11:02:08.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Machine-specific definition for spin locks. Stub version. +- Copyright (C) 1994, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1994, 1997, 2006 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 +@@ -30,7 +30,7 @@ typedef volatile int __spin_lock_t; + + + #ifndef _EXTERN_INLINE +-#define _EXTERN_INLINE extern __inline ++#define _EXTERN_INLINE __extern_inline + #endif + + /* Unlock LOCK. */ +--- libc/sysdeps/generic/allocalim.h.jj 2002-10-09 11:19:59.000000000 +0200 ++++ libc/sysdeps/generic/allocalim.h 2006-11-07 11:03:22.000000000 +0100 +@@ -1,4 +1,4 @@ +-extern inline int __libc_use_alloca (size_t size) ++__extern_inline int __libc_use_alloca (size_t size) + { + return size <= __MAX_ALLOCA_CUTOFF; + } +--- libc/sysdeps/pthread/aio_misc.c.jj 2006-01-04 00:12:54.000000000 +0100 ++++ libc/sysdeps/pthread/aio_misc.c 2006-11-07 11:06:31.000000000 +0100 +@@ -33,7 +33,7 @@ + #ifndef aio_create_helper_thread + # define aio_create_helper_thread __aio_create_helper_thread + +-extern inline int ++__extern_inline int + __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), void *arg) + { + pthread_attr_t attr; +--- libc/sysdeps/s390/bits/string.h.jj 2005-01-28 22:44:42.000000000 +0100 ++++ libc/sysdeps/s390/bits/string.h 2006-11-07 11:07:05.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Optimized, inlined string functions. S/390 version. +- Copyright (C) 2000, 2001 Free Software Foundation, Inc. ++ Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). + This file is part of the GNU C Library. + +@@ -34,7 +34,7 @@ + # ifdef __cplusplus + # define __STRING_INLINE inline + # else +-# define __STRING_INLINE extern __inline ++# define __STRING_INLINE __extern_inline + # endif + #endif + +--- libc/sysdeps/s390/fpu/bits/mathinline.h.jj 2006-02-01 04:00:20.000000000 +0100 ++++ libc/sysdeps/s390/fpu/bits/mathinline.h 2006-11-07 11:07:37.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Inline math functions for s390. +- Copyright (C) 2004 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2006 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 +@@ -24,7 +24,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif + + #if (!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \ +--- libc/sysdeps/powerpc/fpu/bits/mathinline.h.jj 2006-11-06 20:53:15.000000000 +0100 ++++ libc/sysdeps/powerpc/fpu/bits/mathinline.h 2006-11-07 11:08:04.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif /* __cplusplus */ + + #if defined __GNUC__ && !defined _SOFT_FLOAT +--- libc/sysdeps/x86_64/fpu/bits/mathinline.h.jj 2004-09-08 00:18:59.000000000 +0200 ++++ libc/sysdeps/x86_64/fpu/bits/mathinline.h 2006-11-07 11:10:33.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Inline math functions for x86-64. +- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Andreas Jaeger , 2002. + +@@ -25,7 +25,7 @@ + #ifdef __cplusplus + # define __MATH_INLINE __inline + #else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + #endif + + +--- libc/sysdeps/sparc/fpu/bits/mathinline.h.jj 2006-01-14 13:09:02.000000000 +0100 ++++ libc/sysdeps/sparc/fpu/bits/mathinline.h 2006-11-07 11:10:57.000000000 +0100 +@@ -131,7 +131,7 @@ + # ifdef __cplusplus + # define __MATH_INLINE __inline + # else +-# define __MATH_INLINE extern __inline ++# define __MATH_INLINE __extern_inline + # endif /* __cplusplus */ + + /* The gcc, version 2.7 or below, has problems with all this inlining +--- libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h.jj 2004-09-11 18:28:10.000000000 +0200 ++++ libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h 2006-11-07 11:12:07.000000000 +0100 +@@ -1,5 +1,5 @@ + /* System-specific socket constants and types. 4.4 BSD version. +- Copyright (C) 1991,92,1994-2002,2004 Free Software Foundation, Inc. ++ Copyright (C) 1991,92,1994-2002,2004,2006 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 +@@ -227,7 +227,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st + struct cmsghdr *__cmsg) __THROW; + #ifdef __USE_EXTERN_INLINES + # ifndef _EXTERN_INLINE +-# define _EXTERN_INLINE extern __inline ++# define _EXTERN_INLINE __extern_inline + # endif + _EXTERN_INLINE struct cmsghdr * + __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) +--- libc/sysdeps/unix/sysv/linux/ia64/ioperm.c.jj 2004-03-18 00:17:58.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/ia64/ioperm.c 2006-11-07 11:13:23.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. ++/* Copyright (C) 1999, 2000, 2001, 2004, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by David Mosberger-Tang . + +@@ -51,7 +51,7 @@ static struct + } + io; + +-__inline__ unsigned long int ++static __always_inline unsigned long int + io_offset (unsigned long int port) + { + return ((port >> 2) << 12) | (port & 0xfff); +--- libc/sysdeps/unix/sysv/linux/bits/socket.h.jj 2006-04-02 19:25:37.000000000 +0200 ++++ libc/sysdeps/unix/sysv/linux/bits/socket.h 2006-11-07 11:15:04.000000000 +0100 +@@ -264,7 +264,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st + struct cmsghdr *__cmsg) __THROW; + #ifdef __USE_EXTERN_INLINES + # ifndef _EXTERN_INLINE +-# define _EXTERN_INLINE extern __inline ++# define _EXTERN_INLINE __extern_inline + # endif + _EXTERN_INLINE struct cmsghdr * + __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) +--- libc/sysdeps/unix/sysv/linux/bits/sigset.h.jj 2001-07-06 06:56:14.000000000 +0200 ++++ libc/sysdeps/unix/sysv/linux/bits/sigset.h 2006-11-07 11:14:48.000000000 +0100 +@@ -1,5 +1,6 @@ + /* __sig_atomic_t, __sigset_t, and related definitions. Linux version. +- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. ++ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 ++ 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 +@@ -43,7 +44,7 @@ typedef struct + # define _SIGSET_H_fns 1 + + # ifndef _EXTERN_INLINE +-# define _EXTERN_INLINE extern __inline ++# define _EXTERN_INLINE __extern_inline + # endif + + /* Return a mask that includes the bit for SIG only. */ +--- libc/sysdeps/unix/sysv/linux/sys/sysmacros.h.jj 2004-09-08 00:18:59.000000000 +0200 ++++ libc/sysdeps/unix/sysv/linux/sys/sysmacros.h 2006-11-07 11:15:53.000000000 +0100 +@@ -0,0 +1,18 @@ ++/* DO NOT EDIT THIS FILE. ++ ++ It has been auto-edited by fixincludes from: ++ ++ "fixinc/tests/inc/sys/sysmacros.h" ++ ++ This had to be done to correct non-standard usages in the ++ original, manufacturer supplied header file. */ ++ ++ ++ ++#if defined( GLIBC_C99_INLINE_4_CHECK ) ++__extension__ ++#if __STDC_VERSION__ < 19901L ++extern ++#endif ++ __inline unsigned int ++#endif /* GLIBC_C99_INLINE_4_CHECK */ +@@ -1,5 +1,6 @@ + /* Definitions of macros to access `dev_t' values. +- Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc. ++ Copyright (C) 1996, 1997, 1999, 2003, 2004, 2006 ++ 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 +@@ -27,30 +28,30 @@ + they need. */ + #ifdef __GLIBC_HAVE_LONG_LONG + __extension__ +-extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) ++__extern_inline unsigned int gnu_dev_major (unsigned long long int __dev) + __THROW; + __extension__ +-extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev) ++__extern_inline unsigned int gnu_dev_minor (unsigned long long int __dev) + __THROW; + __extension__ +-extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major, ++__extern_inline unsigned long long int gnu_dev_makedev (unsigned int __major, + unsigned int __minor) + __THROW; + + # if defined __GNUC__ && __GNUC__ >= 2 +-__extension__ extern __inline unsigned int ++__extension__ __extern_inline unsigned int + __NTH (gnu_dev_major (unsigned long long int __dev)) + { + return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); + } + +-__extension__ extern __inline unsigned int ++__extension__ __extern_inline unsigned int + __NTH (gnu_dev_minor (unsigned long long int __dev)) + { + return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); + } + +-__extension__ extern __inline unsigned long long int ++__extension__ __extern_inline unsigned long long int + __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor)) + { + return ((__minor & 0xff) | ((__major & 0xfff) << 8) diff --git a/pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch b/pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch new file mode 100644 index 000000000000..45deb1d2d719 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch @@ -0,0 +1,32 @@ +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# T2 SDE: package/.../glibc/x86-fnstsw.patch +# Copyright (C) 2008 The T2 SDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- T2-COPYRIGHT-NOTE-END --- + +Fix more strict checking in binutils since 2.18.50.0.3: + sysdeps/i386/fpu/ftestexcept.c:33: Error: suffix or operands invalid for `fnstsw' + + - Rene Rebe + +--- glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c.vanilla 2008-09-02 12:45:07.000000000 +0200 ++++ glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c 2008-09-02 12:46:37.000000000 +0200 +@@ -26,7 +26,7 @@ + int + fetestexcept (int excepts) + { +- int temp; ++ short temp; + int xtemp = 0; + + /* Get current exceptions. */ diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 2abce029c2ad..057c6a84d840 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,12 +4,12 @@ , supportOldDBs ? true }: -stdenv.mkDerivation { - name = "nix-0.13pre15214"; +stdenv.mkDerivation rec { + name = "nix-0.13pre15614"; src = fetchurl { - url = http://hydra.nixos.org/build/17407/download/1/nix-0.13pre15214.tar.bz2; - sha256 = "b2423eebb0c70fa2c38d11b5d5e6d8794ebc7283dfde8d1f1c02c54846014ab2"; + url = "http://hydra.nixos.org/build/32581/download/4/${name}.tar.bz2"; + sha256 = "236c84cf85739fe1deddd8f98f634eac03df9c7a588f4c1e234e80e84a471d00"; }; buildInputs = [perl curl openssl]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3455865024d4..469eb20144f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3028,7 +3028,12 @@ let inherit fetchurl stdenv pkgconfig gettext; }; - glibc = useFromStdenv "glibc" glibc29; + glibc = useFromStdenv "glibc" (if getConfig ["brokenRedHatKernel"] false then glibc25 else glibc29); + + glibc25 = import ../development/libraries/glibc-2.5 { + inherit fetchurl stdenv kernelHeaders; + installLocales = getPkgConfig "glibc" "locales" false; + }; glibc27 = import ../development/libraries/glibc-2.7 { inherit fetchurl stdenv kernelHeaders;