From e6f77b50e54bbec4335f9d3685cafa869d5811d8 Mon Sep 17 00:00:00 2001 From: Bernhard Fischer Date: Tue, 7 Oct 2008 00:37:03 +0200 Subject: [PATCH] math functions reside in libm with uClibc Draft. Testing in progess. --- .../820-powerpc-softfloat-libm_for_copysignl.diff | 146 +++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 toolchain/gcc/4.4.0/820-powerpc-softfloat-libm_for_copysignl.diff diff --git a/toolchain/gcc/4.4.0/820-powerpc-softfloat-libm_for_copysignl.diff b/toolchain/gcc/4.4.0/820-powerpc-softfloat-libm_for_copysignl.diff new file mode 100644 index 0000000..dd0b5e7 --- /dev/null +++ b/toolchain/gcc/4.4.0/820-powerpc-softfloat-libm_for_copysignl.diff @@ -0,0 +1,146 @@ +diff -dup gcc-4.4.0.old/libgcc/configure gcc-4.4.0/libgcc/configure +--- gcc-4.4.0.old/libgcc/configure 2008-10-03 17:54:34.000000000 +0200 ++++ gcc-4.4.0/libgcc/configure 2008-10-06 17:40:05.000000000 +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 onestep 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 onestep 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' + ac_subst_files='' + ac_pwd=`pwd` + +@@ -3540,6 +3540,47 @@ if test "$enable_tls $gcc_cv_have_cc_tls + fi + + ++# On powerpc libgcc_s references copysignl which is a libm function but ++# glibc apparently also provides it via libc as opposed to uClibc where ++# it lives in libm. ++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 ++ ++ LIBGCC_LIBM= ++ echo '#include ' > conftest.c ++ case $target_alias in ++ *powerpc*) ++ echo 'int the_libc = __UCLIBC__;' >> conftest.c ++ ;; ++ *) ++ echo 'int the_libc; /* dummy */' >> conftest.c ++ ;; ++ esac ++ libgcc_cv_copysignl_lib="libc" ++ 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 ++ lib_copysignl="-lm" ++ libgcc_cv_copysignl_lib="libm" ++ fi ++ rm -f conftest.* ++ ++fi ++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 ++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 ++ ++if test "x$lib_copysignl" != "x"; then ++ LIBGCC_LIBM="$LIBGCC_LIBM $lib_copysignl" ++fi ++ ++ + # Conditionalize the makefile for this target machine. + tmake_file_= + for f in ${tmake_file} +@@ -4261,6 +4302,7 @@ 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,@tmake_file@,$tmake_file,;t t + s,@extra_parts@,$extra_parts,;t t + s,@asm_hidden_op@,$asm_hidden_op,;t t +diff -dup gcc-4.4.0.old/libgcc/configure.ac gcc-4.4.0/libgcc/configure.ac +--- gcc-4.4.0.old/libgcc/configure.ac 2008-10-03 17:54:34.000000000 +0200 ++++ gcc-4.4.0/libgcc/configure.ac 2008-10-06 19:28:30.000000000 +0200 +@@ -215,6 +215,40 @@ if test "$enable_tls $gcc_cv_have_cc_tls + fi + AC_SUBST(set_have_cc_tls) + ++# On powerpc libgcc_s references copysignl which is a libm function but ++# glibc apparently also provides it via libc as opposed to uClibc where ++# it lives in libm. ++dnl save_LIBS="$LIBS" ++dnl LIBS= ++dnl AC_SEARCH_LIBS(copysignl, m) ++dnl LIBGCC_LIBS="$LIBS" ++dnl LIBS="$save_LIBS" ++dnl AC_SUBST(LIBGCC_LIBS) ++AC_CACHE_CHECK([for library containing copysignl], ++ libgcc_cv_copysignl_lib, [ ++ echo '#include ' > conftest.c ++ case $target_alias in ++ *powerpc*) ++ echo 'int the_libc = __UCLIBC__;' >> conftest.c ++ ;; ++ *) ++ echo 'int the_libc; /* dummy */' >> conftest.c ++ ;; ++ esac ++ libgcc_cv_copysignl_lib="-lc" ++ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) ++ then ++ libgcc_cv_copysignl_lib="-lm" ++ fi ++ rm -f conftest.* ++ ]) ++ ++case /${libgcc_cv_copysignl_lib}/ in ++ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; ++ *) LIBGCC_LIBM= ;; ++esac ++AC_SUBST(LIBGCC_LIBM) ++ + # Conditionalize the makefile for this target machine. + tmake_file_= + for f in ${tmake_file} +diff -dup gcc-4.4.0.old/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in +--- gcc-4.4.0.old/libgcc/Makefile.in 2008-10-03 17:54:34.000000000 +0200 ++++ gcc-4.4.0/libgcc/Makefile.in 2008-10-06 20:17:21.000000000 +0200 +@@ -40,6 +40,7 @@ enable_shared = @enable_shared@ + decimal_float = @decimal_float@ + enable_decimal_float = @enable_decimal_float@ + fixed_point = @fixed_point@ ++LIBGCC_LIBM = @LIBGCC_LIBM@ + + host_noncanonical = @host_noncanonical@ + +@@ -878,9 +879,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@onestep@) $(extra-parts) + # @multilib_flags@ is still needed because this may use +--- gcc-4.4.0.old/gcc/config/t-slibgcc-elf-ver 2005-10-31 18:03:08.000000000 +0100 ++++ gcc-4.4.0/gcc/config/t-slibgcc-elf-ver 2008-10-06 20:16:56.000000000 +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) \ -- 2.11.4.GIT