diff -ruNp gcc-4.4.1.orig/gcc/config/rs6000/t-ppccomm gcc-4.4.1/gcc/config/rs6000/t-ppccomm --- gcc-4.4.1.orig/gcc/config/rs6000/t-ppccomm 2008-06-26 22:12:41.000000000 +0200 +++ gcc-4.4.1/gcc/config/rs6000/t-ppccomm 2009-09-17 10:52:37.335783895 +0200 @@ -1,6 +1,9 @@ # Common support for PowerPC ELF targets (both EABI and SVR4). -LIB2FUNCS_EXTRA += tramp.S $(srcdir)/config/rs6000/darwin-ldouble.c +LIB2FUNCS_EXTRA += tramp.S +#ifneq ($(LIBGCC_LDBL),) +LIB2FUNCS_EXTRA += $(srcdir)/config/rs6000/darwin-ldouble.c +#endif # These can't end up in shared libgcc LIB2FUNCS_STATIC_EXTRA = eabi.S diff -ruNp gcc-4.4.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.1/gcc/config/t-slibgcc-elf-ver --- gcc-4.4.1.orig/gcc/config/t-slibgcc-elf-ver 2009-09-17 10:45:49.595814351 +0200 +++ gcc-4.4.1/gcc/config/t-slibgcc-elf-ver 2009-09-17 10:30:28.720513743 +0200 @@ -9,7 +9,7 @@ SHLIB_MAP = @shlib_map_file@ SHLIB_OBJS = @shlib_objs@ SHLIB_DIR = @multilib_dir@ SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ -SHLIB_LC = -lc +SHLIB_LC = @libgcc_libm@ -lc SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -Wl,--soname=$(SHLIB_SONAME) \ diff -ruNp gcc-4.4.1.orig/libgcc/config/rs6000/t-ldbl gcc-4.4.1/libgcc/config/rs6000/t-ldbl --- gcc-4.4.1.orig/libgcc/config/rs6000/t-ldbl 1970-01-01 01:00:00.000000000 +0100 +++ gcc-4.4.1/libgcc/config/rs6000/t-ldbl 2009-09-17 10:30:28.720513743 +0200 @@ -0,0 +1,5 @@ +SHLIB_MAPFILES += $(gcc_srcdir)/config/rs6000/libgcc-ppc-glibc.ver + +#ifeq ($(LIBGCC_LDBL),128) +HOST_LIBGCC2_CFLAGS += -mlong-double-128 +#endif diff -ruNp gcc-4.4.1.orig/libgcc/config.host gcc-4.4.1/libgcc/config.host --- gcc-4.4.1.orig/libgcc/config.host 2009-09-17 10:45:49.595814351 +0200 +++ gcc-4.4.1/libgcc/config.host 2009-09-17 10:30:28.720513743 +0200 @@ -469,6 +469,9 @@ powerpc-*-linux*altivec*) powerpc-*-linux*spe*) tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp" ;; +#powerpc-*-linux-uclibc*) +# tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl t-softfp" +# ;; powerpc-*-linux*) tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp" ;; diff -ruNp gcc-4.4.1.orig/libgcc/configure gcc-4.4.1/libgcc/configure --- gcc-4.4.1.orig/libgcc/configure 2009-09-17 10:45:49.595814351 +0200 +++ gcc-4.4.1/libgcc/configure 2009-09-17 10:30:28.720513743 +0200 @@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1. PACKAGE_BUGREPORT='' ac_unique_file="static-object.mk" -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' +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 LIBGCC_LDBL tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -3547,6 +3547,57 @@ if test "$enable_tls $gcc_cv_have_cc_tls fi +LIBGCC_LDBL=128 +# On powerpc libgcc_s may reference copysignl for TFmode helpers like +# _divtc3 and _multc3. +# glibc apparently also provides copysignl via libc as opposed to uClibc where +# math functions tend to live in libm, provided they are not turned off. +echo "$as_me:$LINENO: checking for library containing copysignl" >&5 +echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 +if test "${libgcc_cv_copysignl_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + echo '#include ' > conftest.c + echo '#include ' >> conftest.c + echo '#if __UCLIBC_HAS_LONG_DOUBLE_MATH__' >> conftest.c + echo 'long double ret;' >> conftest.c + echo 'static void has_ldbl(void) {ret = copysignl(1., -1.);}' >> conftest.c + echo '#endif' >> conftest.c + if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + then + if grep "has_ldbl" conftest.s >/dev/null; then + if grep "copysignl" conftest.s >/dev/null; then + libgcc_cv_copysignl_lib="-lm" + fi + else + LIBGCC_LDBL= + fi + fi + rm -f conftest.* + +fi +echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 +echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 +echo "$as_me:$LINENO: tmake_file='$tmake_file'" >&6 +case /${libgcc_cv_copysignl_lib}/ in + /-l*/) LIBGCC_LIBM="$LIBGCC_LIBM ${libgcc_cv_copysignl_lib}" + echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 +echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 + ;; + *) LIBGCC_LIBM= + echo "$as_me:$LINENO: result: None" >&5 +echo "${ECHO_T}None" >&6 + ;; +esac + + + # Conditionalize the makefile for this target machine. tmake_file_= for f in ${tmake_file} @@ -4267,6 +4318,8 @@ s,@enable_decimal_float@,$enable_decimal s,@fixed_point@,$fixed_point,;t t s,@vis_hide@,$vis_hide,;t t s,@set_have_cc_tls@,$set_have_cc_tls,;t t +s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t +s,@LIBGCC_LDBL@,$LIBGCC_LDBL,;t t s,@tmake_file@,$tmake_file,;t t s,@extra_parts@,$extra_parts,;t t s,@asm_hidden_op@,$asm_hidden_op,;t t diff -ruNp gcc-4.4.1.orig/libgcc/configure.ac gcc-4.4.1/libgcc/configure.ac --- gcc-4.4.1.orig/libgcc/configure.ac 2009-09-17 10:45:49.595814351 +0200 +++ gcc-4.4.1/libgcc/configure.ac 2009-09-17 10:30:28.720513743 +0200 @@ -223,6 +223,43 @@ if test "$enable_tls $gcc_cv_have_cc_tls fi AC_SUBST(set_have_cc_tls) +LIBGCC_LDBL=128 +# On powerpc libgcc_s may reference copysignl for TFmode helpers like +# _divtc3 and _multc3. +# glibc apparently also provides copysignl via libc as opposed to uClibc where +# math functions tend to live in libm, provided they are not turned off. +AC_CACHE_CHECK([for library containing copysignl], + libgcc_cv_copysignl_lib, [ + echo '#include ' > conftest.c + echo '#include ' >> conftest.c + echo '#if __UCLIBC_HAS_LONG_DOUBLE_MATH__' >> conftest.c + echo 'long double ret;' >> conftest.c + echo 'static void has_ldbl(void) {ret = copysignl(1., -1.);}' >> conftest.c + echo '#endif' >> conftest.c + if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) + then + if grep "has_ldbl" conftest.s >/dev/null; then + if grep "copysignl" conftest.s >/dev/null; then + libgcc_cv_copysignl_lib="-lm" + fi + else + LIBGCC_LDBL= + fi + fi + rm -f conftest.* + ]) + +case /${libgcc_cv_copysignl_lib}/ in + /-l*/) LIBGCC_LIBM="$LIBGCC_LIBM ${libgcc_cv_copysignl_lib}" + AC_MSG_RESULT([$libgcc_cv_copysignl_lib]) + ;; + *) LIBGCC_LIBM= + AC_MSG_RESULT(None) + ;; +esac +AC_SUBST(LIBGCC_LIBM) +AC_SUBST(LIBGCC_LDBL) + # Conditionalize the makefile for this target machine. tmake_file_= for f in ${tmake_file} diff -ruNp gcc-4.4.1.orig/libgcc/Makefile.in gcc-4.4.1/libgcc/Makefile.in --- gcc-4.4.1.orig/libgcc/Makefile.in 2009-09-17 10:45:49.600026370 +0200 +++ gcc-4.4.1/libgcc/Makefile.in 2009-09-17 10:30:28.724513657 +0200 @@ -39,6 +39,8 @@ enable_shared = @enable_shared@ decimal_float = @decimal_float@ enable_decimal_float = @enable_decimal_float@ fixed_point = @fixed_point@ +LIBGCC_LIBM = @LIBGCC_LIBM@ +LIBGCC_LDBL = @LIBGCC_LDBL@ host_noncanonical = @host_noncanonical@ @@ -787,9 +789,10 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects @multilib_dir@,$(MULTIDIR),$(subst \ @shlib_objs@,$(objects),$(subst \ @shlib_base_name@,libgcc_s,$(subst \ + @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ @shlib_map_file@,$(mapfile),$(subst \ @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ - @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) + @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) # @multilib_flags@ is still needed because this may use