1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
[As applied to 2.15]
commit 3a533ca370725b68b516e6b74adf4727d17ed28a
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Apr 24 10:22:45 2012 +0000
Don't handle libgcc_s suffixes.
diff -urpN glibc-2.15.orig/config.make.in glibc-2.15/config.make.in
--- glibc-2.15.orig/config.make.in 2017-02-08 13:24:23.338055977 -0800
+++ glibc-2.15/config.make.in 2017-02-08 13:25:21.810625337 -0800
@@ -50,7 +50,6 @@ have-z-execstack = @libc_cv_z_execstack@
have-initfini = @libc_cv_have_initfini@
have-Bgroup = @libc_cv_Bgroup@
have-as-needed = @libc_cv_as_needed@
-libgcc_s_suffix = @libc_cv_libgcc_s_suffix@
need-nopic-initfini = @nopic_initfini@
with-fp = @with_fp@
old-glibc-headers = @old_glibc_headers@
diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
--- glibc-2.15.orig/configure 2017-02-08 13:24:23.346056054 -0800
+++ glibc-2.15/configure 2017-02-08 13:27:07.327670602 -0800
@@ -654,7 +654,6 @@ libc_cv_z_execstack
libc_cv_z_combreloc
ASFLAGS_config
libc_cv_as_needed
-libc_cv_libgcc_s_suffix
libc_cv_Bgroup
libc_cv_cc_with_libunwind
VERSIONING
@@ -6465,24 +6464,6 @@ fi
$as_echo "$libc_cv_Bgroup" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcc_s suffix" >&5
-$as_echo_n "checking for libgcc_s suffix... " >&6; }
-if ${libc_cv_libgcc_s_suffix+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<EOF
-int main (void) { return 0; }
-EOF
- libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
- -fPIC -shared -shared-libgcc -o conftest.so \
- conftest.c -v 2>&1 >/dev/null \
- | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
- rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_libgcc_s_suffix" >&5
-$as_echo "$libc_cv_libgcc_s_suffix" >&6; }
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5
$as_echo_n "checking for --as-needed option... " >&6; }
if ${libc_cv_as_needed+:} false; then :
@@ -6493,7 +6474,7 @@ int main (void) { return 0; }
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c
- -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
+ -lgcc_s -Wl,--as-needed
-nostdlib 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
--- glibc-2.15.orig/configure.in 2017-02-08 13:24:23.346056054 -0800
+++ glibc-2.15/configure.in 2017-02-08 13:26:44.383441535 -0800
@@ -1639,20 +1639,6 @@ EOF
rm -f conftest*])
AC_SUBST(libc_cv_Bgroup)
- AC_CACHE_CHECK(for libgcc_s suffix,
- libc_cv_libgcc_s_suffix, [dnl
- cat > conftest.c <<EOF
-int main (void) { return 0; }
-EOF
-changequote(,)dnl
- libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
- -fPIC -shared -shared-libgcc -o conftest.so \
- conftest.c -v 2>&1 >/dev/null \
- | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
-changequote([,])dnl
- rm -f conftest*])
- AC_SUBST(libc_cv_libgcc_s_suffix)
-
AC_CACHE_CHECK(for --as-needed option,
libc_cv_as_needed, [dnl
cat > conftest.c <<EOF
@@ -1660,7 +1646,7 @@ int main (void) { return 0; }
EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c
- -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
+ -lgcc_s -Wl,--as-needed
-nostdlib 1>&AS_MESSAGE_LOG_FD])
then
libc_cv_as_needed=yes
diff -urpN glibc-2.15.orig/Makeconfig glibc-2.15/Makeconfig
--- glibc-2.15.orig/Makeconfig 2017-02-08 13:24:23.338055977 -0800
+++ glibc-2.15/Makeconfig 2017-02-08 13:24:31.262132679 -0800
@@ -565,7 +565,7 @@ endif
ifneq ($(have-as-needed),yes)
libgcc_eh := -lgcc_eh $(libunwind)
else
- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
+ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
endif
gnulib := -lgcc $(libgcc_eh)
static-gnulib := -lgcc -lgcc_eh $(libunwind)
|
