powerpc-link-with-math-lib.patch.conditional 5.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125
  1. See: http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00237.html
  2. Patch by: Bernhard Reutner-Fischer
  3. --- gcc-4.3.3/gcc/config/t-slibgcc-elf-ver 2005-02-20 00:44:10.000000000 +1300
  4. +++ gcc-4.3.3-p/gcc/config/t-slibgcc-elf-ver 2009-05-06 07:05:50.000000000 +1200
  5. @@ -9,7 +9,7 @@
  6. SHLIB_OBJS = @shlib_objs@
  7. SHLIB_DIR = @multilib_dir@
  8. SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
  9. -SHLIB_LC = -lc
  10. +SHLIB_LC = @libgcc_libm@ -lc
  11. SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
  12. -Wl,--soname=$(SHLIB_SONAME) \
  13. --- gcc-4.3.3/libgcc/configure 2008-11-21 06:09:53.000000000 +1300
  14. +++ gcc-4.3.3-p/libgcc/configure 2009-05-06 07:05:50.000000000 +1200
  15. @@ -272,7 +272,7 @@
  16. PACKAGE_BUGREPORT=''
  17. ac_unique_file="static-object.mk"
  18. -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'
  19. +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'
  20. ac_subst_files=''
  21. # Initialize some variables set by options.
  22. @@ -3505,6 +3505,39 @@
  23. fi
  24. +# On powerpc libgcc_s references copysignl which is a libm function but
  25. +# glibc apparently also provides it via libc as opposed to uClibc where
  26. +# it lives in libm.
  27. +echo "$as_me:$LINENO: checking for library containing copysignl" >&5
  28. +echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
  29. +if test "${libgcc_cv_copysignl_lib+set}" = set; then
  30. + echo $ECHO_N "(cached) $ECHO_C" >&6
  31. +else
  32. +
  33. + echo '#include <features.h>' > conftest.c
  34. + echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
  35. + libgcc_cv_copysignl_lib="-lc"
  36. + if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
  37. + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  38. + (eval $ac_try) 2>&5
  39. + ac_status=$?
  40. + echo "$as_me:$LINENO: \$? = $ac_status" >&5
  41. + (exit $ac_status); }; }
  42. + then
  43. + libgcc_cv_copysignl_lib="-lm"
  44. + fi
  45. + rm -f conftest.*
  46. +
  47. +fi
  48. +echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
  49. +echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
  50. +
  51. +case /${libgcc_cv_copysignl_lib}/ in
  52. + /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
  53. + *) LIBGCC_LIBM= ;;
  54. +esac
  55. +
  56. +
  57. # Conditionalize the makefile for this target machine.
  58. tmake_file_=
  59. for f in ${tmake_file}
  60. @@ -4225,6 +4258,7 @@
  61. s,@fixed_point@,$fixed_point,;t t
  62. s,@vis_hide@,$vis_hide,;t t
  63. s,@set_have_cc_tls@,$set_have_cc_tls,;t t
  64. +s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
  65. s,@tmake_file@,$tmake_file,;t t
  66. s,@extra_parts@,$extra_parts,;t t
  67. s,@asm_hidden_op@,$asm_hidden_op,;t t
  68. --- gcc-4.3.3/libgcc/configure.ac 2008-11-21 06:09:53.000000000 +1300
  69. +++ gcc-4.3.3-p/libgcc/configure.ac 2009-05-06 07:05:50.000000000 +1200
  70. @@ -207,6 +207,27 @@
  71. fi
  72. AC_SUBST(set_have_cc_tls)
  73. +# On powerpc libgcc_s references copysignl which is a libm function but
  74. +# glibc apparently also provides it via libc as opposed to uClibc where
  75. +# it lives in libm.
  76. +AC_CACHE_CHECK([for library containing copysignl],
  77. + libgcc_cv_copysignl_lib, [
  78. + echo '#include <features.h>' > conftest.c
  79. + echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
  80. + libgcc_cv_copysignl_lib="-lc"
  81. + if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
  82. + then
  83. + libgcc_cv_copysignl_lib="-lm"
  84. + fi
  85. + rm -f conftest.*
  86. + ])
  87. +
  88. +case /${libgcc_cv_copysignl_lib}/ in
  89. + /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
  90. + *) LIBGCC_LIBM= ;;
  91. +esac
  92. +AC_SUBST(LIBGCC_LIBM)
  93. +
  94. # Conditionalize the makefile for this target machine.
  95. tmake_file_=
  96. for f in ${tmake_file}
  97. --- gcc-4.3.3/libgcc/Makefile.in 2008-06-17 21:32:34.000000000 +1200
  98. +++ gcc-4.3.3-p/libgcc/Makefile.in 2009-05-06 07:05:50.000000000 +1200
  99. @@ -40,6 +40,7 @@
  100. decimal_float = @decimal_float@
  101. enable_decimal_float = @enable_decimal_float@
  102. fixed_point = @fixed_point@
  103. +LIBGCC_LIBM = @LIBGCC_LIBM@
  104. host_noncanonical = @host_noncanonical@
  105. @@ -738,9 +739,10 @@
  106. @multilib_dir@,$(MULTIDIR),$(subst \
  107. @shlib_objs@,$(objects),$(subst \
  108. @shlib_base_name@,libgcc_s,$(subst \
  109. + @libgcc_libm@,$(LIBGCC_LIBM),$(subst \
  110. @shlib_map_file@,$(mapfile),$(subst \
  111. @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
  112. - @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
  113. + @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
  114. libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
  115. # @multilib_flags@ is still needed because this may use