From f65b980818175a0c6109e5b42bf594bc84a28f3f Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 5 Aug 2012 01:43:16 +0200 Subject: [PATCH] glibc: Updated (2.14.1 -> 2.16.0) --- base/glibc/any-cc-as-ld-ok.patch.toolchain | 43 +++-------- .../glibc-2.13-do-not-link-nss_test1.patch | 36 --------- base/glibc/glibc-2.13-gcc_fix-1.patch | 65 ---------------- .../glibc-2.14-reexport-rpc-interface.patch | 77 ------------------- ...glibc-2.14-reinstall-nis-rpc-headers.patch | 44 ----------- ...glibc-2.16.0-ldd-rewrite-multilib-1.patch} | 12 +-- base/glibc/glibc.conf | 3 + base/glibc/glibc.desc | 8 +- base/glibc/x86-i686.patch | 40 ---------- 9 files changed, 22 insertions(+), 306 deletions(-) delete mode 100644 base/glibc/glibc-2.13-do-not-link-nss_test1.patch delete mode 100644 base/glibc/glibc-2.13-gcc_fix-1.patch delete mode 100644 base/glibc/glibc-2.14-reexport-rpc-interface.patch delete mode 100644 base/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch rename base/glibc/{glibc-2.5-ldd-rewrite-multilib-1.patch => glibc-2.16.0-ldd-rewrite-multilib-1.patch} (54%) delete mode 100644 base/glibc/x86-i686.patch diff --git a/base/glibc/any-cc-as-ld-ok.patch.toolchain b/base/glibc/any-cc-as-ld-ok.patch.toolchain index b71703e19..26b9e6b81 100644 --- a/base/glibc/any-cc-as-ld-ok.patch.toolchain +++ b/base/glibc/any-cc-as-ld-ok.patch.toolchain @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../glibc/any-cc-as-ld-ok.patch.toolchain -# Copyright (C) 2010 The OpenSDE Project +# Copyright (C) 2010 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -18,13 +18,13 @@ At toolchain stage we only install glibc headers, so any version of gcc, as and ld are ok for us. ---- glibc-2.14.1/configure.orig 2011-10-07 11:48:55.000000000 +0200 -+++ glibc-2.14.1/configure 2011-11-10 18:23:48.900099502 +0100 -@@ -4760,9 +4760,9 @@ +--- glibc-2.16.0/configure.orig 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/configure 2012-08-05 01:35:35.047013403 +0200 +@@ -4653,9 +4653,9 @@ ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) +- 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) + *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -32,11 +32,11 @@ and ld are ok for us. esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 -@@ -4823,9 +4823,9 @@ +@@ -4716,9 +4716,9 @@ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) +- 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) + *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -44,11 +44,11 @@ and ld are ok for us. esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 -@@ -4939,9 +4939,9 @@ +@@ -4782,9 +4782,9 @@ ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 3.4* | 4.[0-9]* ) +- 4.[3-9].* | 4.[1-9][0-9].* | [5-9].* ) + *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -56,28 +56,3 @@ and ld are ok for us. esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 ---- glibc-2.14.1/nptl/sysdeps/pthread/configure.orig 2011-10-07 11:48:55.000000000 +0200 -+++ glibc-2.14.1/nptl/sysdeps/pthread/configure 2011-11-10 18:33:29.760099780 +0100 -@@ -128,22 +128,6 @@ - } # ac_fn_c_try_link - # This file is generated from configure.in by Autoconf. DO NOT EDIT! - --if test "x$libc_cv_gcc___thread" != xyes; then -- as_fn_error $? "compiler support for __thread is required" "$LINENO" 5 --fi -- --if test "x${libc_cv_visibility_attribute}" != xyes || -- test "x${libc_cv_broken_visibility_attribute}" != xno; then -- as_fn_error $? "working compiler support for visibility attribute is required" "$LINENO" 5 --fi -- --if test "x$libc_cv_asm_cfi_directives" != xyes; then -- case "$base_machine" in -- i386 | x86_64 | powerpc | s390) -- as_fn_error $? "CFI directive support in assembler is required" "$LINENO" 5 ;; -- *) ;; -- esac --fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forced unwind support" >&5 diff --git a/base/glibc/glibc-2.13-do-not-link-nss_test1.patch b/base/glibc/glibc-2.13-do-not-link-nss_test1.patch deleted file mode 100644 index 93e9fafec..000000000 --- a/base/glibc/glibc-2.13-do-not-link-nss_test1.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/glibc-2.13-do-not-link-nss_test1.patch -# Copyright (C) 2011 The OpenSDE 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -Origin: Linuxfromscratch Project - -test-installation.pl script in that it tries to link a test program to a -library that isn't installed by make install - -LFS is using the following sed command to fix it: - -sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl - ---- glibc-2.13/scripts/test-installation.pl.orig 2011-08-22 09:41:35.640080447 +0200 -+++ glibc-2.13/scripts/test-installation.pl 2011-08-22 09:42:02.828085678 +0200 -@@ -105,7 +105,7 @@ - # - libdb1 since it conflicts with libdb - # - libnss1_* from glibc-compat add-on - # - libthread_db since it contains unresolved references -- if ($name ne "nss_ldap" && $name ne "db1" -+ if ($name ne "nss_ldap" && $name ne "db1" && $name ne "nss_test1" - && !($name =~/^nss1_/) && $name ne "thread_db") { - $link_libs .= " -l$name"; - $versions{$name} = $version; diff --git a/base/glibc/glibc-2.13-gcc_fix-1.patch b/base/glibc/glibc-2.13-gcc_fix-1.patch deleted file mode 100644 index 6aca1bfe0..000000000 --- a/base/glibc/glibc-2.13-gcc_fix-1.patch +++ /dev/null @@ -1,65 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/glibc-2.13-gcc_fix-1.patch -# Copyright (C) 2011 The OpenSDE 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -Submitted By: Matt Burgess -Date: 2010-04-18 -Initial Package Version: 2.11.1 -Upstream Status: Not Submitted -Origin: http://www.eglibc.org/archives/patches/msg00073.html -Description: Fixes the following build problem with GCC-4.5.0: - -/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os -./sysdeps/i386/fpu/s_frexp.S: Assembler messages: -./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef" -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.' -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1' -./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive -./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if" -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression -make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1 - -diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c ---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 20:10:20.000000000 +0000 -+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-17 11:34:06.882681001 +0000 -@@ -45,6 +45,11 @@ - /* Embed an #include to pull in the alignment and .end directives. */ - asm ("\n#include \"defs.h\""); - -+asm ("\n#if defined __i686 && defined __ASSEMBLER__"); -+asm ("\n#undef __i686"); -+asm ("\n#define __i686 __i686"); -+asm ("\n#endif"); -+ - /* The initial common code ends here. */ - asm ("\n/*@HEADER_ENDS*/"); - -diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h ---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 20:10:20.000000000 +0000 -+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-17 11:34:06.882681001 +0000 -@@ -29,6 +29,10 @@ - #include - #include - -+#if defined __i686 && defined __ASSEMBLER__ -+#undef __i686 -+#define __i686 __i686 -+#endif - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h diff --git a/base/glibc/glibc-2.14-reexport-rpc-interface.patch b/base/glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index df2f4505c..000000000 --- a/base/glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,77 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/glibc-2.14-reexport-rpc-interface.patch -# Copyright (C) 2011 The OpenSDE 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -From 74c9f73df627d015e171089ad44e0e752cbf1fe5 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Thu, 12 May 2011 17:30:08 +0200 -Subject: [PATCH 1/2] Reexport RPC interface - ---- - NEWS | 10 ---------- - include/libc-symbols.h | 2 +- - sunrpc/Makefile | 2 +- - 3 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/NEWS b/NEWS -index bb517c2..6504f81 100644 ---- a/NEWS -+++ b/NEWS -@@ -27,16 +27,6 @@ Version 2.14 - 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, - 12795, 12811, 12813, 12814, 12841 - --* The RPC implementation in libc is obsoleted. Old programs keep working -- but new programs cannot be linked with the routines in libc anymore. -- Programs in need of RPC functionality must be linked against TI-RPC. -- The TI-RPC implementation is IPv6 enabled and there are other benefits. -- -- Visible changes of this change include (obviously) the inability to link -- programs using RPC functions without referencing the TI-RPC library and the -- removal of the RPC headers from the glibc headers. -- Implemented by Ulrich Drepper. -- - * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, - syncfs, setns, sendmmsg - -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 7245deb..5a47da8 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen --- -1.7.2.3 - diff --git a/base/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/base/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index 736bf78fe..000000000 --- a/base/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/glibc-2.14-reinstall-nis-rpc-headers.patch -# Copyright (C) 2011 The OpenSDE 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -From cd85f89a1383fcdaca5ab3ead536047192527579 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH 2/2] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index e7e5f0c..f63ada6 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.2.3 - diff --git a/base/glibc/glibc-2.5-ldd-rewrite-multilib-1.patch b/base/glibc/glibc-2.16.0-ldd-rewrite-multilib-1.patch similarity index 54% rename from base/glibc/glibc-2.5-ldd-rewrite-multilib-1.patch rename to base/glibc/glibc-2.16.0-ldd-rewrite-multilib-1.patch index e5991f394..05a5d9aa3 100644 --- a/base/glibc/glibc-2.5-ldd-rewrite-multilib-1.patch +++ b/base/glibc/glibc-2.16.0-ldd-rewrite-multilib-1.patch @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../glibc/glibc-2.5-ldd-rewrite-multilib-1.patch -# Copyright (C) 2010 The OpenSDE Project +# Filename: package/.../glibc/glibc-2.16.0-ldd-rewrite-multilib-1.patch +# Copyright (C) 2010 - 2012 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,10 +14,10 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- glibc-2.5/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed.orig 2007-09-30 05:48:45.000000000 +0300 -+++ glibc-2.5/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2007-09-30 05:49:30.000000000 +0300 +--- glibc-2.16.0/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed.orig 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2012-08-05 01:26:04.355022490 +0200 @@ -1,3 +1,3 @@ /LD_TRACE_LOADED_OBJECTS=1/a\ add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" --s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4\5\6"_ -+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \264\4\5\6"_ +-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ ++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf index 9a73d79ed..f68edf7f1 100644 --- a/base/glibc/glibc.conf +++ b/base/glibc/glibc.conf @@ -101,6 +101,9 @@ fi var_append extraconfopt " " "--enable-add-ons=$glibc_addons" +# build and install the obsolete RPC code for link-time usage +var_append extraconfopt " " "--enable-obsolete-rpc" + # control whether to include profiling support if [ $SDECFG_PKG_GLIBC_ENABLE_PROFILE = 1 ] ; then var_append extraconfopt " " "--enable-profile" diff --git a/base/glibc/glibc.desc b/base/glibc/glibc.desc index 54d81ed4b..7116777fd 100644 --- a/base/glibc/glibc.desc +++ b/base/glibc/glibc.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../glibc/glibc.desc -[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -33,8 +33,8 @@ [L] GPL [S] Stable -[V] 2.14.1 +[V] 2.16.0 [P] X 01---5---9 101.600 -[D] 2396118112 glibc-2.14.1.tar.bz2 http://ftp.gnu.org/gnu/glibc/ -[D] 345925754 glibc-ports-2.14.1.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 413505592 glibc-2.16.0.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 2073681237 glibc-ports-2.16.0.tar.bz2 http://ftp.gnu.org/gnu/glibc/ diff --git a/base/glibc/x86-i686.patch b/base/glibc/x86-i686.patch deleted file mode 100644 index 707da7412..000000000 --- a/base/glibc/x86-i686.patch +++ /dev/null @@ -1,40 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/x86-i686.patch -# Copyright (C) 2004 - 2006 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -__i686 is used in assembler, but when optimizing for a 686-class CPU -gcc defines __i686 as cpp macro ... - - - Rene Rebe - ---- glibc-20050919/csu/defs.awk.vanilla 2005-11-03 13:16:56.000000000 +0100 -+++ glibc-20050919/csu/defs.awk 2005-11-03 13:17:10.000000000 +0100 -@@ -24,4 +24,5 @@ - - print "#include "; - print "weak_extern (__gmon_start__)"; -+ print "#undef __i686"; - } ---- glibc-20050919/sysdeps/i386/bp-asm.h.vanilla 2005-11-03 14:27:22.000000000 +0100 -+++ glibc-20050919/sysdeps/i386/bp-asm.h 2005-11-03 14:27:39.000000000 +0100 -@@ -22,6 +22,8 @@ - #ifndef _bp_asm_h_ - # define _bp_asm_h_ 1 - -+#undef __i686 -+ - # if __ASSEMBLER__ - - # if __BOUNDED_POINTERS__