Changeset 00520f6 in clfs-sysroot for patches/glibc-2.6-libgcc_eh-1.patch


Ignore:
Timestamp:
Jul 22, 2007, 4:11:02 PM (17 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
42d73f3
Parents:
9568bd5
Message:

Update patches.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/glibc-2.6-libgcc_eh-1.patch

    r9568bd5 r00520f6  
    77             the glibc will attempt to link to it.
    88
    9 diff -Naur glibc-2.5.orig/Makeconfig glibc-2.5/Makeconfig
    10 --- glibc-2.5.orig/Makeconfig   2006-11-09 11:40:14.000000000 -0500
    11 +++ glibc-2.5/Makeconfig        2006-11-09 11:40:31.000000000 -0500
    12 @@ -526,12 +526,20 @@
     9diff -Naur glibc-2.6.orig/config.make.in glibc-2.6/config.make.in
     10--- glibc-2.6.orig/config.make.in       2007-06-23 21:26:46.000000000 -0400
     11+++ glibc-2.6/config.make.in    2007-06-23 21:27:16.000000000 -0400
     12@@ -59,6 +59,7 @@
     13 have-libaudit = @have_libaudit@
     14 have-libcap = @have_libcap@
     15 have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
     16+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
     17 fno-unit-at-a-time = @fno_unit_at_a_time@
     18 bind-now = @bindnow@
     19 have-hash-style = @libc_cv_hashstyle@
     20diff -Naur glibc-2.6.orig/configure.in glibc-2.6/configure.in
     21--- glibc-2.6.orig/configure.in 2007-06-23 21:26:48.000000000 -0400
     22+++ glibc-2.6/configure.in      2007-06-23 21:27:16.000000000 -0400
     23@@ -1388,6 +1388,23 @@
     24     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
     25   fi
     26 
     27+  AC_CACHE_CHECK(whether to link against libgcc_eh,
     28+                 libc_cv_cc_with_libgcc_eh, [
     29+    cat > conftest.c <<EOF
     30+int main (void) { return 0; }
     31+EOF
     32+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     33+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     34+      libc_cv_cc_with_libgcc_eh=yes
     35+    else
     36+      libc_cv_cc_with_libgcc_eh=no
     37+    fi
     38+    rm -f conftest*])
     39+  AC_SUBST(libc_cv_cc_with_libgcc_eh)
     40+  if test $libc_cv_cc_with_libgcc_eh = yes; then
     41+    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
     42+  fi
     43+
     44   AC_CACHE_CHECK(for -z nodelete option,
     45                 libc_cv_z_nodelete, [dnl
     46   cat > conftest.c <<EOF
     47diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig
     48--- glibc-2.6.orig/Makeconfig   2007-06-23 21:26:49.000000000 -0400
     49+++ glibc-2.6/Makeconfig        2007-06-23 21:27:16.000000000 -0400
     50@@ -524,12 +524,20 @@
    1351   libunwind = -lunwind
    1452 endif
    … …  
    3270 endif
    3371 ifeq ($(elf),yes)
    34 diff -Naur glibc-2.5.orig/config.make.in glibc-2.5/config.make.in
    35 --- glibc-2.5.orig/config.make.in       2006-11-09 11:40:14.000000000 -0500
    36 +++ glibc-2.5/config.make.in    2006-11-09 11:40:31.000000000 -0500
    37 @@ -63,6 +63,7 @@
    38  have-libaudit = @have_libaudit@
    39  have-libcap = @have_libcap@
    40  have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
    41 +have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
    42  fno-unit-at-a-time = @fno_unit_at_a_time@
    43  bind-now = @bindnow@
    44  have-hash-style = @libc_cv_hashstyle@
    45 diff -Naur glibc-2.5.orig/configure glibc-2.5/configure
    46 --- glibc-2.5.orig/configure    2006-11-09 11:40:14.000000000 -0500
    47 +++ glibc-2.5/configure 2006-11-09 11:41:03.000000000 -0500
     72diff -Naur glibc-2.6.orig/configure glibc-2.6/configure
     73--- glibc-2.6.orig/configure    2007-06-23 21:26:49.000000000 -0400
     74+++ glibc-2.6/configure 2007-06-23 21:29:47.000000000 -0400
    4875@@ -313,7 +313,7 @@
    4976 # include <unistd.h>
    5077 #endif"
    5178 
    52 -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 enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux 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 libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
    53 +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 enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_cc_with_libgcc_eh libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux 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 libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
     79-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 enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux 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 libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
     80+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 enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_cc_with_libgcc_eh libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux 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 libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
    5481 ac_subst_files=''
    5582 
    5683 # Initialize some variables set by options.
    57 @@ -5552,6 +5552,33 @@
     84@@ -5542,6 +5542,33 @@
    5885 
    5986   fi
    … …  
    89116 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6
    90117 if test "${libc_cv_z_nodelete+set}" = set; then
    91 @@ -8512,6 +8539,7 @@
     118@@ -8543,6 +8570,7 @@
     119 s,@BISON@,$BISON,;t t
    92120 s,@VERSIONING@,$VERSIONING,;t t
    93  s,@libc_cv_asm_protected_directive@,$libc_cv_asm_protected_directive,;t t
    94121 s,@libc_cv_cc_with_libunwind@,$libc_cv_cc_with_libunwind,;t t
    95122+s,@libc_cv_cc_with_libgcc_eh@,$libc_cv_cc_with_libgcc_eh,;t t
    96  s,@libc_cv_z_nodelete@,$libc_cv_z_nodelete,;t t
    97  s,@libc_cv_z_nodlopen@,$libc_cv_z_nodlopen,;t t
    98  s,@libc_cv_z_initfirst@,$libc_cv_z_initfirst,;t t
    99 diff -Naur glibc-2.5.orig/configure.in glibc-2.5/configure.in
    100 --- glibc-2.5.orig/configure.in 2006-11-09 11:40:15.000000000 -0500
    101 +++ glibc-2.5/configure.in      2006-11-09 11:40:31.000000000 -0500
    102 @@ -1391,6 +1391,23 @@
    103      AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    104    fi
    105  
    106 +  AC_CACHE_CHECK(whether to link against libgcc_eh,
    107 +                 libc_cv_cc_with_libgcc_eh, [
    108 +    cat > conftest.c <<EOF
    109 +int main (void) { return 0; }
    110 +EOF
    111 +    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
    112 +       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
    113 +      libc_cv_cc_with_libgcc_eh=yes
    114 +    else
    115 +      libc_cv_cc_with_libgcc_eh=no
    116 +    fi
    117 +    rm -f conftest*])
    118 +  AC_SUBST(libc_cv_cc_with_libgcc_eh)
    119 +  if test $libc_cv_cc_with_libgcc_eh = yes; then
    120 +    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
    121 +  fi
    122 +
    123    AC_CACHE_CHECK(for -z nodelete option,
    124                  libc_cv_z_nodelete, [dnl
    125    cat > conftest.c <<EOF
     123 s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
     124 s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t
     125 s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t
Note: See TracChangeset for help on using the changeset viewer.