1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.3.2/glibc-2.3.2-allow-gcc-3.4-nounit.patch Sat Feb 24 11:00:05 2007 +0000
1.3 @@ -0,0 +1,137 @@
1.4 +Fixes errors like
1.5 +
1.6 +# gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crtn.o(.text+0x0):mipsel-unknown-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crtn.S:20: multiple definition of `dummy'
1.7 +# gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crti.o(.text+0x0):mipsel-unknown-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crti.S:42: first defined here
1.8 +# /gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crti.o(.init+0x28):mipsel-unknown-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/csu/crti.S:58: undefined reference to `i_am_not_a_leaf'
1.9 +
1.10 +CVSROOT: /cvs/glibc
1.11 +Module name: libc
1.12 +Changes by: aj@sourceware.org 2003-12-02 07:37:29
1.13 +
1.14 +Modified files:
1.15 + . : configure.in configure config.make.in
1.16 + csu : Makefile
1.17 + locale : Makefile
1.18 + linuxthreads : Makefile
1.19 + linuxthreads/sysdeps/unix/sysv/linux/x86_64: Makefile
1.20 + nptl : Makefile
1.21 + nptl/sysdeps/unix/sysv/linux/x86_64: Makefile
1.22 +
1.23 +Log message:
1.24 + * config.make.in (fno-unit-at-a-time): Define.
1.25 +
1.26 + * configure.in: Add test for -fno-unit-at-a-time.
1.27 + Fix text for -fpie.
1.28 +
1.29 + * csu/Makefile (CFLAGS-initfini.s): Add $(fno_unit_at_a_time).
1.30 + * locale/Makefile (CFLAGS-loadlocale.c): Likewise.
1.31 +
1.32 + For linuxthreads:
1.33 + * Makefile (CFLAGS-pt-initfini.s): Add $(fno_unit_at_a_time).
1.34 + * sysdeps/unix/sysv/linux/x86_64/Makefile (CFLAGS-pt-initfini.s):
1.35 + Likewise.
1.36 +
1.37 + For nptl:
1.38 + * Makefile (CFLAGS-pt-initfini.s): Add $(fno_unit_at_a_time).
1.39 + * sysdeps/unix/sysv/linux/x86_64/Makefile (CFLAGS-pt-initfini.s):
1.40 + Likewise.
1.41 +
1.42 +Main glibc change retrieved with
1.43 +wget -O foo.patch 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/config.make.in.diff?r1=1.98&r2=1.99&cvsroot=glibc' \
1.44 +'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/configure.diff?r1=1.393&r2=1.394&cvsroot=glibc' \
1.45 +'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/csu/Makefile.diff?r1=1.71&r2=1.72&cvsroot=glibc' \
1.46 +'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/locale/Makefile.diff?r1=1.71&r2=1.72&cvsroot=glibc'
1.47 +
1.48 +and then rediffed against glibc-2.3.2
1.49 +See also ../glibc-linuxthreads-2.3.2/glibc-linuxthreads-2.3.2-allow-3.4.patch
1.50 +
1.51 +diff -aur glibc-2.3.2/config.make.in glibc-2.3.2-nounit/config.make.in
1.52 +--- glibc-2.3.2/config.make.in 2002-11-14 14:53:32.000000000 -0800
1.53 ++++ glibc-2.3.2-nounit/config.make.in 2004-05-29 23:19:58.000000000 -0700
1.54 +@@ -50,6 +50,7 @@
1.55 + old-glibc-headers = @old_glibc_headers@
1.56 + unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
1.57 + have-initfini-array = @libc_cv_initfinit_array@
1.58 ++fno-unit-at-a-time = @fno_unit_at_a_time@
1.59 +
1.60 + static-libgcc = @libc_cv_gcc_static_libgcc@
1.61 +
1.62 +diff -aur glibc-2.3.2/configure glibc-2.3.2-nounit/configure
1.63 +--- glibc-2.3.2/configure 2003-02-26 01:20:48.000000000 -0800
1.64 ++++ glibc-2.3.2-nounit/configure 2004-05-30 06:22:31.000000000 -0700
1.65 +@@ -312,7 +312,7 @@
1.66 + # include <unistd.h>
1.67 + #endif"
1.68 +
1.69 +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PWD_P CC MAKE MSGFMT MAKEINFO SED AUTOCONF CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO OLD_DEBIAN_INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup libc_cv_z_combreloc libc_cv_have_initfini no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
1.70 ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S PWD_P CC MAKE MSGFMT MAKEINFO SED AUTOCONF CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO OLD_DEBIAN_INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup libc_cv_z_combreloc fno_unit_at_a_time libc_cv_have_initfini no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
1.71 + ac_subst_files=''
1.72 +
1.73 + # Initialize some variables set by options.
1.74 +@@ -4984,6 +4984,35 @@
1.75 + fi
1.76 +
1.77 +
1.78 ++echo "$as_me:$LINENO: checking for -fno-unit-at-a-time" >&5
1.79 ++echo $ECHO_N "checking for -fno-unit-at-a-time... $ECHO_C" >&6
1.80 ++if test "${libc_cv_fno_unit_at_a_time+set}" = set; then
1.81 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.82 ++else
1.83 ++ cat > conftest.c <<EOF
1.84 ++int foo;
1.85 ++EOF
1.86 ++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S -fno-unit-at-a-time
1.87 ++ conftest.c 1>&5'
1.88 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.89 ++ (eval $ac_try) 2>&5
1.90 ++ ac_status=$?
1.91 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.92 ++ (exit $ac_status); }; }
1.93 ++then
1.94 ++ libc_cv_fno_unit_at_a_time=yes
1.95 ++else
1.96 ++ libc_cv_fno_unit_at_a_time=no
1.97 ++fi
1.98 ++rm -f conftest*
1.99 ++fi
1.100 ++echo "$as_me:$LINENO: result: $libc_cv_fno_unit_at_a_time" >&5
1.101 ++echo "${ECHO_T}$libc_cv_fno_unit_at_a_time" >&6
1.102 ++if test $libc_cv_fno_unit_at_a_time = yes; then
1.103 ++ fno_unit_at_a_time=-fno-unit-at-a-time
1.104 ++fi
1.105 ++
1.106 ++
1.107 + if test $elf != yes; then
1.108 + echo "$as_me:$LINENO: checking for .init and .fini sections" >&5
1.109 + echo $ECHO_N "checking for .init and .fini sections... $ECHO_C" >&6
1.110 +@@ -7236,6 +7265,7 @@
1.111 + s,@libc_cv_z_initfirst@,$libc_cv_z_initfirst,;t t
1.112 + s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
1.113 + s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t
1.114 ++s,@fno_unit_at_a_time@,$fno_unit_at_a_time,;t t
1.115 + s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t
1.116 + s,@no_whole_archive@,$no_whole_archive,;t t
1.117 + s,@exceptions@,$exceptions,;t t
1.118 +diff -aur glibc-2.3.2/csu/Makefile glibc-2.3.2-nounit/csu/Makefile
1.119 +--- glibc-2.3.2/csu/Makefile 2002-12-31 14:24:37.000000000 -0800
1.120 ++++ glibc-2.3.2-nounit/csu/Makefile 2004-05-29 23:18:27.000000000 -0700
1.121 +@@ -99,7 +99,7 @@
1.122 + $(objpfx)crt%.o: $(objpfx)crt%.S $(objpfx)defs.h
1.123 + $(compile.S) -g0 $(ASFLAGS-.os) -o $@
1.124 +
1.125 +-CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions
1.126 ++CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)
1.127 +
1.128 + vpath initfini.c $(full_config_sysdirs)
1.129 +
1.130 +diff -aur glibc-2.3.2/locale/Makefile glibc-2.3.2-nounit/locale/Makefile
1.131 +--- glibc-2.3.2/locale/Makefile 2002-10-17 10:05:53.000000000 -0700
1.132 ++++ glibc-2.3.2-nounit/locale/Makefile 2004-05-29 23:18:27.000000000 -0700
1.133 +@@ -100,6 +100,7 @@
1.134 + CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
1.135 + CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
1.136 + CFLAGS-charmap-dir.c = -Wno-write-strings
1.137 ++CFLAGS-loadlocale.c = $(fno-unit-at-a-time)
1.138 +
1.139 + # This makes sure -DNOT_IN_libc is passed for all these modules.
1.140 + cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \