patches/gcc/4.4.4/380-powerpc-libgcc_s-link-libm.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Oct 12 23:47:24 2010 +0200 (2010-10-12)
changeset 2148 ada9128c98b8
parent 1948 d341be24dc68
permissions -rw-r--r--
cc/gcc: fix 4.4.4 patchset

Most patches contained two spurious first lines.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1948
     1
http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
yann@1948
     2
yann@1948
     3
On glibc the libc.so carries a copy of the math function copysignl() but
yann@1948
     4
on uClibc math functions like copysignl() live in libm. Since libgcc_s
yann@1948
     5
contains unresolved symbols, any attempt to link against libgcc_s
yann@1948
     6
without explicitely specifying -lm fails, resulting in a broken
yann@1948
     7
bootstrap of the compiler.
yann@1948
     8
yann@1948
     9
yann@1948
    10
diff -durN gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver gcc-4.4.4/gcc/config/t-slibgcc-elf-ver
yann@1948
    11
--- gcc-4.4.4.orig/gcc/config/t-slibgcc-elf-ver	2010-01-04 16:13:08.000000000 +0100
yann@1948
    12
+++ gcc-4.4.4/gcc/config/t-slibgcc-elf-ver	2010-05-16 19:38:36.000000000 +0200
yann@1948
    13
@@ -9,7 +9,7 @@
yann@1948
    14
 SHLIB_OBJS = @shlib_objs@
yann@1948
    15
 SHLIB_DIR = @multilib_dir@
yann@1948
    16
 SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
yann@1948
    17
-SHLIB_LC = -lc
yann@1948
    18
+SHLIB_LC = @libgcc_libm@ -lc
yann@1948
    19
 SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
yann@1948
    20
 SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
yann@1948
    21
 	$$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
yann@1948
    22
diff -durN gcc-4.4.4.orig/libgcc/Makefile.in gcc-4.4.4/libgcc/Makefile.in
yann@1948
    23
--- gcc-4.4.4.orig/libgcc/Makefile.in	2009-04-10 01:23:07.000000000 +0200
yann@1948
    24
+++ gcc-4.4.4/libgcc/Makefile.in	2010-05-16 19:38:36.000000000 +0200
yann@1948
    25
@@ -39,6 +39,7 @@
yann@1948
    26
 decimal_float = @decimal_float@
yann@1948
    27
 enable_decimal_float = @enable_decimal_float@
yann@1948
    28
 fixed_point = @fixed_point@
yann@1948
    29
+LIBGCC_LIBM = @LIBGCC_LIBM@
yann@1948
    30
 
yann@1948
    31
 host_noncanonical = @host_noncanonical@
yann@1948
    32
 
yann@1948
    33
@@ -787,9 +788,10 @@
yann@1948
    34
 		@multilib_dir@,$(MULTIDIR),$(subst \
yann@1948
    35
 		@shlib_objs@,$(objects),$(subst \
yann@1948
    36
 		@shlib_base_name@,libgcc_s,$(subst \
yann@1948
    37
+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
yann@1948
    38
 		@shlib_map_file@,$(mapfile),$(subst \
yann@1948
    39
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
yann@1948
    40
-		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
yann@1948
    41
+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
yann@1948
    42
 
yann@1948
    43
 libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
yann@1948
    44
 	# @multilib_flags@ is still needed because this may use
yann@1948
    45
diff -durN gcc-4.4.4.orig/libgcc/configure gcc-4.4.4/libgcc/configure
yann@1948
    46
--- gcc-4.4.4.orig/libgcc/configure	2008-11-20 18:13:01.000000000 +0100
yann@1948
    47
+++ gcc-4.4.4/libgcc/configure	2010-05-16 19:38:36.000000000 +0200
yann@1948
    48
@@ -272,7 +272,7 @@
yann@1948
    49
 PACKAGE_BUGREPORT=''
yann@1948
    50
 
yann@1948
    51
 ac_unique_file="static-object.mk"
yann@1948
    52
-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'
yann@1948
    53
+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'
yann@1948
    54
 ac_subst_files=''
yann@1948
    55
 ac_pwd=`pwd`
yann@1948
    56
 
yann@1948
    57
@@ -3547,6 +3547,39 @@
yann@1948
    58
 fi
yann@1948
    59
 
yann@1948
    60
 
yann@1948
    61
+# On powerpc libgcc_s references copysignl which is a libm function but
yann@1948
    62
+# glibc apparently also provides it via libc as opposed to uClibc where
yann@1948
    63
+# it lives in libm.
yann@1948
    64
+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
yann@1948
    65
+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
yann@1948
    66
+if test "${libgcc_cv_copysignl_lib+set}" = set; then
yann@1948
    67
+  echo $ECHO_N "(cached) $ECHO_C" >&6
yann@1948
    68
+else
yann@1948
    69
+
yann@1948
    70
+    echo '#include <features.h>' > conftest.c
yann@1948
    71
+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
yann@1948
    72
+    libgcc_cv_copysignl_lib="-lc"
yann@1948
    73
+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
yann@1948
    74
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
yann@1948
    75
+  (eval $ac_try) 2>&5
yann@1948
    76
+  ac_status=$?
yann@1948
    77
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@1948
    78
+  (exit $ac_status); }; }
yann@1948
    79
+    then
yann@1948
    80
+	libgcc_cv_copysignl_lib="-lm"
yann@1948
    81
+    fi
yann@1948
    82
+    rm -f conftest.*
yann@1948
    83
+
yann@1948
    84
+fi
yann@1948
    85
+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
yann@1948
    86
+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
yann@1948
    87
+
yann@1948
    88
+case /${libgcc_cv_copysignl_lib}/ in
yann@1948
    89
+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
yann@1948
    90
+  *) LIBGCC_LIBM= ;;
yann@1948
    91
+esac
yann@1948
    92
+
yann@1948
    93
+
yann@1948
    94
 # Conditionalize the makefile for this target machine.
yann@1948
    95
 tmake_file_=
yann@1948
    96
 for f in ${tmake_file}
yann@1948
    97
@@ -4267,6 +4300,7 @@
yann@1948
    98
 s,@fixed_point@,$fixed_point,;t t
yann@1948
    99
 s,@vis_hide@,$vis_hide,;t t
yann@1948
   100
 s,@set_have_cc_tls@,$set_have_cc_tls,;t t
yann@1948
   101
+s,@LIBGCC_LIBM@,$LIBGCC_LIBM,;t t
yann@1948
   102
 s,@tmake_file@,$tmake_file,;t t
yann@1948
   103
 s,@extra_parts@,$extra_parts,;t t
yann@1948
   104
 s,@asm_hidden_op@,$asm_hidden_op,;t t
yann@1948
   105
diff -durN gcc-4.4.4.orig/libgcc/configure.ac gcc-4.4.4/libgcc/configure.ac
yann@1948
   106
--- gcc-4.4.4.orig/libgcc/configure.ac	2008-11-20 18:13:01.000000000 +0100
yann@1948
   107
+++ gcc-4.4.4/libgcc/configure.ac	2010-05-16 19:38:36.000000000 +0200
yann@1948
   108
@@ -223,6 +223,27 @@
yann@1948
   109
 fi
yann@1948
   110
 AC_SUBST(set_have_cc_tls)
yann@1948
   111
 
yann@1948
   112
+# On powerpc libgcc_s references copysignl which is a libm function but
yann@1948
   113
+# glibc apparently also provides it via libc as opposed to uClibc where
yann@1948
   114
+# it lives in libm.
yann@1948
   115
+AC_CACHE_CHECK
yann@1948
   116
+  libgcc_cv_copysignl_lib,
yann@1948
   117
+    echo '#include <features.h>' > conftest.c
yann@1948
   118
+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
yann@1948
   119
+    libgcc_cv_copysignl_lib="-lc"
yann@1948
   120
+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
yann@1948
   121
+    then
yann@1948
   122
+	libgcc_cv_copysignl_lib="-lm"
yann@1948
   123
+    fi
yann@1948
   124
+    rm -f conftest.*
yann@1948
   125
+  ])
yann@1948
   126
+
yann@1948
   127
+case /${libgcc_cv_copysignl_lib}/ in
yann@1948
   128
+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
yann@1948
   129
+  *) LIBGCC_LIBM= ;;
yann@1948
   130
+esac
yann@1948
   131
+AC_SUBST(LIBGCC_LIBM)
yann@1948
   132
+
yann@1948
   133
 # Conditionalize the makefile for this target machine.
yann@1948
   134
 tmake_file_=
yann@1948
   135
 for f in ${tmake_file}