aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2009-08-28 15:22:18 +0000
committerJan Beulich <jbeulich@gcc.gnu.org>2009-08-28 15:22:18 +0000
commit39ba7b7db1164ba2b3ae770d0472957c7452efba (patch)
treea5fe753d35fb1728e55fd221d8599ae1b7612044
parent7e49a4b3969b940d0165515374f81c0307965d45 (diff)
downloadgcc-39ba7b7db1164ba2b3ae770d0472957c7452efba.zip
gcc-39ba7b7db1164ba2b3ae770d0472957c7452efba.tar.gz
gcc-39ba7b7db1164ba2b3ae770d0472957c7452efba.tar.bz2
configure.ac: For in-tree ld...
2009-08-28 Jan Beulich <jbeulich@novell.com> * configure.ac: For in-tree ld, do a plain version check to determine whether comdat groups are supported. * configure: Regenerate. From-SVN: r151162
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure8
-rw-r--r--gcc/configure.ac8
3 files changed, 20 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c53d9c8..eba4de6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-28 Jan Beulich <jbeulich@novell.com>
+
+ * configure.ac: For in-tree ld, do a plain version check to
+ determine whether comdat groups are supported.
+ * configure: Regenerate.
+
2009-08-28 Olivier Hainque <hainque@adacore.com>
* collect2.c (DO_COLLECT_EXPORT_LIST): New internal macro,
diff --git a/gcc/configure b/gcc/configure
index 429d3be..dbc7f15 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21294,7 +21294,13 @@ fi
$as_echo "$gcc_cv_as_comdat_group_percent" >&6; }
fi
-if test $in_tree_ld != yes && test x"$ld_vers" != x; then
+if test $in_tree_ld = yes ; then
+ comdat_group=no
+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
+ && test $in_tree_ld_is_elf = yes; then
+ comdat_group=yes
+ fi
+elif test x"$ld_vers" != x; then
comdat_group=yes
if test 0"$ld_date" -lt 20050308; then
if test -n "$ld_date"; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 878d4e7..6cc94d8 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2393,7 +2393,13 @@ else
[elf,2,16,0], [--fatal-warnings],
[.section .text,"axG",%progbits,.foo,comdat])
fi
-if test $in_tree_ld != yes && test x"$ld_vers" != x; then
+if test $in_tree_ld = yes ; then
+ comdat_group=no
+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
+ && test $in_tree_ld_is_elf = yes; then
+ comdat_group=yes
+ fi
+elif test x"$ld_vers" != x; then
comdat_group=yes
if test 0"$ld_date" -lt 20050308; then
if test -n "$ld_date"; then