summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbeulich <jbeulich@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-28 15:22:18 +0000
committerjbeulich <jbeulich@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-28 15:22:18 +0000
commite97d11c2d96cba76314c253ce54ebe1898a603b4 (patch)
treea5fe753d35fb1728e55fd221d8599ae1b7612044
parent912df7563c0a8b5789d2dd128a2915c14d11120d (diff)
downloadgcc-e97d11c2d96cba76314c253ce54ebe1898a603b4.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151162 138bc75d-0d04-0410-961f-82ee72b054a4
-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 c53d9c8ef82..eba4de6a0c4 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 429d3be8e94..dbc7f154a3b 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 878d4e74ff6..6cc94d88344 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