source: patches/glibc-2.9-libgcc_eh-1.patch@ d378786

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since d378786 was dbb2738d, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Update Patches.
  • Property mode set to 100644
File size: 4.5 KB

  • config.make.in 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 2006-11-09
Initial Package Version: 2.5
Origin: Joe Ciccone
Upstream Status: Unknown
Description: Checks to see if libgcc_eh has been provided by gcc. If it has
             the glibc will attempt to link to it.

             Rediffed for 2.7 by Jim Gifford
             Rediffed for 2.8 by Joe Ciccone
             Rediffed for 2.9 by Joe Ciccone

diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/config.make.in
    old new  
    6060have-libaudit = @have_libaudit@
    6161have-libcap = @have_libcap@
    6262have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
     63have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
    6364fno-unit-at-a-time = @fno_unit_at_a_time@
    6465bind-now = @bindnow@
    6566have-hash-style = @libc_cv_hashstyle@

  • configure.in 

    diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in
    old new  
    13941394    AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    13951395  fi
    13961396
     1397  AC_CACHE_CHECK(whether to link against libgcc_eh,
     1398                 libc_cv_cc_with_libgcc_eh, [
     1399    cat > conftest.c <<EOF
     1400int main (void) { return 0; }
     1401EOF
     1402    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     1403       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     1404      libc_cv_cc_with_libgcc_eh=yes
     1405    else
     1406      libc_cv_cc_with_libgcc_eh=no
     1407    fi
     1408    rm -f conftest*])
     1409  AC_SUBST(libc_cv_cc_with_libgcc_eh)
     1410  if test $libc_cv_cc_with_libgcc_eh = yes; then
     1411    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
     1412  fi
     1413
    13971414  AC_CACHE_CHECK(for -z nodelete option,
    13981415                 libc_cv_z_nodelete, [dnl
    13991416  cat > conftest.c <<EOF

  • configure 

    diff -Naur glibc-2.9.orig/configure glibc-2.9/configure
    old new  
    716716BISON
    717717VERSIONING
    718718libc_cv_cc_with_libunwind
     719libc_cv_cc_with_libgcc_eh
    719720libc_cv_Bgroup
    720721libc_cv_libgcc_s_suffix
    721722libc_cv_as_needed
    … …  
    60536054
    60546055  fi
    60556056
     6057  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
     6058echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
     6059if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
     6060  echo $ECHO_N "(cached) $ECHO_C" >&6
     6061else
     6062
     6063    cat > conftest.c <<EOF
     6064int main (void) { return 0; }
     6065EOF
     6066    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     6067       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     6068      libc_cv_cc_with_libgcc_eh=yes
     6069    else
     6070      libc_cv_cc_with_libgcc_eh=no
     6071    fi
     6072    rm -f conftest*
     6073fi
     6074{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
     6075echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
     6076
     6077  if test $libc_cv_cc_with_libgcc_eh = yes; then
     6078    cat >>confdefs.h <<\_ACEOF
     6079#define HAVE_CC_WITH_LIBGCC_EH 1
     6080_ACEOF
     6081
     6082  fi
     6083
    60566084  { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
    60576085echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
    60586086if test "${libc_cv_z_nodelete+set}" = set; then
    … …  
    92829310BISON!$BISON$ac_delim
    92839311VERSIONING!$VERSIONING$ac_delim
    92849312libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
     9313libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
    92859314libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
    92869315libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
    92879316libc_cv_as_needed!$libc_cv_as_needed$ac_delim
    … …  
    93359364LTLIBOBJS!$LTLIBOBJS$ac_delim
    93369365_ACEOF
    93379366
    9338   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
     9367  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
    93399368    break
    93409369  elif $ac_last_try; then
    93419370    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

  • Makeconfig 

    diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
    old new  
    525525  libunwind = -lunwind
    526526endif
    527527ifneq ($(have-as-needed),yes)
    528  libgcc_eh := -lgcc_eh $(libunwind)
     528 ifneq ($(have-cc-with-libgcc_eh),yes)
     529  libgcc_eh := $(libunwind)
     530 else
     531  libgcc_eh := -lgcc_eh $(libunwind)
     532 endif
    529533else
    530534 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
    531535endif
    532536gnulib := -lgcc $(libgcc_eh)
    533 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     537ifneq ($(have-cc-with-libgcc_eh),yes)
     538 static-gnulib := -lgcc $(libunwind)
     539else
     540 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     541endif
    534542libc.so-gnulib := -lgcc
    535543endif
    536544ifeq ($(elf),yes)
Note: See TracBrowser for help on using the repository browser.