| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127 |
- http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
- On glibc the libc.so carries a copy of the math function copysignl() but
- on uClibc math functions like copysignl() live in libm. Since libgcc_s
- contains unresolved symbols, any attempt to link against libgcc_s
- without explicitely specifying -lm fails, resulting in a broken
- bootstrap of the compiler.
- Forward ported to gcc 4.7.3
- Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
- diff -Nura gcc-4.7.3.orig/libgcc/config/t-slibgcc gcc-4.7.3/libgcc/config/t-slibgcc
- --- gcc-4.7.3.orig/libgcc/config/t-slibgcc 2013-04-11 15:23:46.491571116 -0300
- +++ gcc-4.7.3/libgcc/config/t-slibgcc 2013-04-11 15:25:06.241141824 -0300
- @@ -27,7 +27,7 @@
- SHLIB_OBJS = @shlib_objs@
- SHLIB_DIR = @multilib_dir@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
- -SHLIB_LC = -lc
- +SHLIB_LC = @libgcc_libm@ -lc
- SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
- SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
- $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
- diff -Nura gcc-4.7.3.orig/libgcc/configure gcc-4.7.3/libgcc/configure
- --- gcc-4.7.3.orig/libgcc/configure 2013-04-11 15:23:46.551573051 -0300
- +++ gcc-4.7.3/libgcc/configure 2013-04-11 15:25:06.243141875 -0300
- @@ -563,6 +563,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
- +LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
- @@ -4445,6 +4446,37 @@
- fi
- 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
- +
- + echo '#include <features.h>' > conftest.c
- + echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
- + libgcc_cv_copysignl_lib="-lc"
- + 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
- + libgcc_cv_copysignl_lib="-lm"
- + fi
- + rm -f conftest.*
- +
- +fi
- +echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
- +echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
- +
- +case /${libgcc_cv_copysignl_lib}/ in
- + /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
- + *) LIBGCC_LIBM= ;;
- +esac
-
- # Conditionalize the makefile for this target machine.
- tmake_file_=
- diff -Nura gcc-4.7.3.orig/libgcc/configure.ac gcc-4.7.3/libgcc/configure.ac
- --- gcc-4.7.3.orig/libgcc/configure.ac 2013-04-11 15:23:46.551573051 -0300
- +++ gcc-4.7.3/libgcc/configure.ac 2013-04-11 15:25:06.244141901 -0300
- @@ -324,6 +324,27 @@
- 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.
- +AC_CACHE_CHECK
- + libgcc_cv_copysignl_lib,
- + echo '#include <features.h>' > conftest.c
- + echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
- + 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)
- +
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
- diff -Nura gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in
- --- gcc-4.7.3.orig/libgcc/Makefile.in 2013-04-11 15:23:46.537572599 -0300
- +++ gcc-4.7.3/libgcc/Makefile.in 2013-04-11 15:25:06.241141824 -0300
- @@ -41,6 +41,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
- +LIBGCC_LIBM = @LIBGCC_LIBM@
-
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
- @@ -928,9 +929,10 @@
- @multilib_dir@,$(MULTIDIR),$(subst \
- @shlib_objs@,$(objects) libgcc.a,$(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
|
