| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Thu, 11 Jun 2015 20:52:26 -0700 | |
| branch | s11-update |
| changeset 4493 | aad77f4a709b |
| permissions | -rw-r--r-- |
|
4493
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
1 |
# From upstream |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
2 |
# HG changeset patch |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
3 |
# Parent 4db8e90a5543cdee793f797fd94cb4587105f89e |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
4 |
Restore Sun as COMDAT group support |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
diff --git a/gcc/configure b/gcc/configure |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
--- a/gcc/configure |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ b/gcc/configure |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -23121,9 +23121,6 @@ fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
10 |
if test $gcc_cv_as_comdat_group_percent = yes; then |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
11 |
gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
12 |
else |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
13 |
- if test -z "${gcc_cv_as_comdat_group_group+set}"; then
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
14 |
- gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
15 |
- fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
16 |
case "${target}" in
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
17 |
# Sun as uses a completely different syntax. |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
18 |
*-*-solaris2*) |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
19 |
@@ -23173,6 +23170,9 @@ fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
20 |
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
21 |
;; |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
22 |
esac |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
23 |
+ if test -z "${gcc_cv_as_comdat_group_group+set}"; then
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
24 |
+ gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
25 |
+ fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
26 |
fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
27 |
fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
28 |
if test x"$ld_is_gold" = xyes; then |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
29 |
diff --git a/gcc/configure.ac b/gcc/configure.ac |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
30 |
--- a/gcc/configure.ac |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
31 |
+++ b/gcc/configure.ac |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
32 |
@@ -2787,9 +2787,6 @@ else |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
33 |
if test $gcc_cv_as_comdat_group_percent = yes; then |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
34 |
gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
35 |
else |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
36 |
- if test -z "${gcc_cv_as_comdat_group_group+set}"; then
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
37 |
- gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
38 |
- fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
39 |
case "${target}" in
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
40 |
# Sun as uses a completely different syntax. |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
41 |
*-*-solaris2*) |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
42 |
@@ -2816,6 +2813,9 @@ else |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
43 |
,, [$conftest_s]) |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
44 |
;; |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
45 |
esac |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
46 |
+ if test -z "${gcc_cv_as_comdat_group_group+set}"; then
|
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
47 |
+ gcc_cv_as_comdat_group_group=no |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
48 |
+ fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
49 |
fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
50 |
fi |
|
aad77f4a709b
19969975 gcc 4.8.2 regression to old GNU linkonce
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
51 |
if test x"$ld_is_gold" = xyes; then |