1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch Sun May 16 19:41:53 2010 +0200
1.3 @@ -0,0 +1,137 @@
1.4 +http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
1.5 +
1.6 +On glibc the libc.so carries a copy of the math function copysignl() but
1.7 +on uClibc math functions like copysignl() live in libm. Since libgcc_s
1.8 +contains unresolved symbols, any attempt to link against libgcc_s
1.9 +without explicitely specifying -lm fails, resulting in a broken
1.10 +bootstrap of the compiler.
1.11 +
1.12 +
1.13 +diff -rdup gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver gcc-4.4.0/gcc/config/t-slibgcc-elf-ver
1.14 +
1.15 +diff -durN gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.4/gcc/config/t-slibgcc-elf-ver
1.16 +--- gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver 2010-01-04 16:13:08.000000000 +0100
1.17 ++++ gcc-4.4.4/gcc/config/t-slibgcc-elf-ver 2010-05-16 19:38:36.000000000 +0200
1.18 +@@ -9,7 +9,7 @@
1.19 + SHLIB_OBJS = @shlib_objs@
1.20 + SHLIB_DIR = @multilib_dir@
1.21 + SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
1.22 +-SHLIB_LC = -lc
1.23 ++SHLIB_LC = @libgcc_libm@ -lc
1.24 + SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
1.25 + SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
1.26 + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
1.27 +diff -durN gcc-4.4.4.orig/libgcc/Makefile.in gcc-4.4.4/libgcc/Makefile.in
1.28 +--- gcc-4.4.4.orig/libgcc/Makefile.in 2009-04-10 01:23:07.000000000 +0200
1.29 ++++ gcc-4.4.4/libgcc/Makefile.in 2010-05-16 19:38:36.000000000 +0200
1.30 +@@ -39,6 +39,7 @@
1.31 + decimal_float = @decimal_float@
1.32 + enable_decimal_float = @enable_decimal_float@
1.33 + fixed_point = @fixed_point@
1.34 ++LIBGCC_LIBM = @LIBGCC_LIBM@
1.35 +
1.36 + host_noncanonical = @host_noncanonical@
1.37 +
1.38 +@@ -787,9 +788,10 @@
1.39 + @multilib_dir@,$(MULTIDIR),$(subst \
1.40 + @shlib_objs@,$(objects),$(subst \
1.41 + @shlib_base_name@,libgcc_s,$(subst \
1.42 ++ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
1.43 + @shlib_map_file@,$(mapfile),$(subst \
1.44 + @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
1.45 +- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
1.46 ++ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
1.47 +
1.48 + libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
1.49 + # @multilib_flags@ is still needed because this may use
1.50 +diff -durN gcc-4.4.4.orig/libgcc/configure gcc-4.4.4/libgcc/configure
1.51 +--- gcc-4.4.4.orig/libgcc/configure 2008-11-20 18:13:01.000000000 +0100
1.52 ++++ gcc-4.4.4/libgcc/configure 2010-05-16 19:38:36.000000000 +0200
1.53 +@@ -272,7 +272,7 @@
1.54 + PACKAGE_BUGREPORT=''
1.55 +
1.56 + ac_unique_file="static-object.mk"
1.57 +-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 libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
1.58 ++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 libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls LIBGCC_LIBM tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
1.59 + ac_subst_files=''
1.60 + ac_pwd=`pwd`
1.61 +
1.62 +@@ -3547,6 +3547,39 @@
1.63 + fi
1.64 +
1.65 +
1.66 ++# On powerpc libgcc_s references copysignl which is a libm function but
1.67 ++# glibc apparently also provides it via libc as opposed to uClibc where
1.68 ++# it lives in libm.
1.69 ++echo "$as_me:$LINENO: checking for library containing copysignl" >&5
1.70 ++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
1.71 ++if test "${libgcc_cv_copysignl_lib+set}" = set; then
1.72 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.73 ++else
1.74 ++
1.75 ++ echo '#include <features.h>' > conftest.c
1.76 ++ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
1.77 ++ libgcc_cv_copysignl_lib="-lc"
1.78 ++ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
1.79 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.80 ++ (eval $ac_try) 2>&5
1.81 ++ ac_status=$?
1.82 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.83 ++ (exit $ac_status); }; }
1.84 ++ then
1.85 ++ libgcc_cv_copysignl_lib="-lm"
1.86 ++ fi
1.87 ++ rm -f conftest.*
1.88 ++
1.89 ++fi
1.90 ++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
1.91 ++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
1.92 ++
1.93 ++case /${libgcc_cv_copysignl_lib}/ in
1.94 ++ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
1.95 ++ *) LIBGCC_LIBM= ;;
1.96 ++esac
1.97 ++
1.98 ++
1.99 + # Conditionalize the makefile for this target machine.
1.100 + tmake_file_=
1.101 + for f in ${tmake_file}
1.102 +@@ -4267,6 +4300,7 @@
1.103 + s,@fixed_point@,$fixed_point,;t t
1.104 + s,@vis_hide@,$vis_hide,;t t
1.105 + s,@set_have_cc_tls@,$set_have_cc_tls,;t t
1.106 ++s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
1.107 + s,@tmake_file@,$tmake_file,;t t
1.108 + s,@extra_parts@,$extra_parts,;t t
1.109 + s,@asm_hidden_op@,$asm_hidden_op,;t t
1.110 +diff -durN gcc-4.4.4.orig/libgcc/configure.ac gcc-4.4.4/libgcc/configure.ac
1.111 +--- gcc-4.4.4.orig/libgcc/configure.ac 2008-11-20 18:13:01.000000000 +0100
1.112 ++++ gcc-4.4.4/libgcc/configure.ac 2010-05-16 19:38:36.000000000 +0200
1.113 +@@ -223,6 +223,27 @@
1.114 + fi
1.115 + AC_SUBST(set_have_cc_tls)
1.116 +
1.117 ++# On powerpc libgcc_s references copysignl which is a libm function but
1.118 ++# glibc apparently also provides it via libc as opposed to uClibc where
1.119 ++# it lives in libm.
1.120 ++AC_CACHE_CHECK
1.121 ++ libgcc_cv_copysignl_lib,
1.122 ++ echo '#include <features.h>' > conftest.c
1.123 ++ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
1.124 ++ libgcc_cv_copysignl_lib="-lc"
1.125 ++ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
1.126 ++ then
1.127 ++ libgcc_cv_copysignl_lib="-lm"
1.128 ++ fi
1.129 ++ rm -f conftest.*
1.130 ++ ])
1.131 ++
1.132 ++case /${libgcc_cv_copysignl_lib}/ in
1.133 ++ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
1.134 ++ *) LIBGCC_LIBM= ;;
1.135 ++esac
1.136 ++AC_SUBST(LIBGCC_LIBM)
1.137 ++
1.138 + # Conditionalize the makefile for this target machine.
1.139 + tmake_file_=
1.140 + for f in ${tmake_file}