Skip to content

R
riscv-gcc-1
Commit 55c4f715 by Rainer Orth Committed by Rainer Orth
Options

configure.ac: Determine Sun ld version numbers. 

	* configure.ac: Determine Sun ld version numbers.
	(comdat_group): Restrict GNU ld version checks to gld.
	(comdat_group, *-*-solaris2.1[1-9]*): Enable for Sun ld > 1.1688.
	(enable_comdat): Support --enable-comdat.
	* configure: Regenerate.
	* doc/install.texi (Configuration): Document --enable-comdat.

From-SVN: r158172
parent 62e08523
Showing with 111 additions and 8 deletions
gcc/ChangeLog
2010-04-09 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac: Determine Sun ld version numbers.
(comdat_group): Restrict GNU ld version checks to gld.
(comdat_group, *-*-solaris2.1[1-9]*): Enable for Sun ld > 1.1688.
(enable_comdat): Support --enable-comdat.
* configure: Regenerate.
* doc/install.texi (Configuration): Document --enable-comdat.
2010-04-09 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config/sparc/sol2-gld.h: Remove SPARC reference.
Rename ...
* config/sol2-gld.h: ... here.
......
gcc/configure
......@@ -900,6 +900,7 @@ with_pic
enable_fast_install
enable_libtool_lock
with_plugin_ld
enable_comdat
enable_gnu_unique_object
enable_linker_build_id
with_long_double_128
......@@ -1602,6 +1603,7 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-comdat enable COMDAT group support
--enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on
glibc systems
--enable-linker-build-id
......@@ -17037,7 +17039,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 17040 "configure"
#line 17042 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -17143,7 +17145,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 17146 "configure"
#line 17148 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -21210,6 +21212,27 @@ if test $in_tree_ld != yes ; then
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
else
case "${target}" in
*-*-solaris2*)
#
# Solaris 2 ld -V output looks like this for a regular version:
#
# ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1699
#
# but test versions add stuff at the end:
#
# ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10
#
ld_ver=`$gcc_cv_ld -V 2>&1`
if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
ld_vers=`echo $ld_ver | sed -n \
-e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
fi
;;
esac
fi
fi
......@@ -21808,7 +21831,7 @@ elif test $in_tree_ld = yes ; then
&& test $in_tree_ld_is_elf = yes; then
comdat_group=yes
fi
elif test x"$ld_vers" != x; then
elif echo "$ld_ver" | grep GNU > /dev/null; then
comdat_group=yes
if test 0"$ld_date" -lt 20050308; then
if test -n "$ld_date"; then
......@@ -21821,9 +21844,32 @@ elif test x"$ld_vers" != x; then
fi
fi
else
# assume linkers other than GNU ld don't support COMDAT group
comdat_group=no
case "${target}" in
*-*-solaris2.1[1-9]*)
# Sun ld has COMDAT group support since Solaris 9, but it doesn't
# interoperate with GNU as until Solaris 11 build 130, i.e. ld
# version 1.688.
#
# FIXME: Maybe need to refine later when COMDAT group support with
# Sun as is implemented.
if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 1688; then
comdat_group=yes
else
comdat_group=no
fi
;;
*)
# Assume linkers other than GNU ld don't support COMDAT group.
comdat_group=no
;;
esac
fi
# Allow overriding the automatic COMDAT group tests above.
# Check whether --enable-comdat was given.
if test "${enable_comdat+set}" = set; then :
enableval=$enable_comdat; comdat_group="$enable_comdat"
fi
if test $comdat_group = no; then
gcc_cv_as_comdat_group=no
gcc_cv_as_comdat_group_percent=no
......
gcc/configure.ac
......@@ -2142,6 +2142,27 @@ if test $in_tree_ld != yes ; then
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
else
case "${target}" in
*-*-solaris2*)
#
# Solaris 2 ld -V output looks like this for a regular version:
#
# ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1699
#
# but test versions add stuff at the end:
#
# ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10
#
ld_ver=`$gcc_cv_ld -V 2>&1`
if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
ld_vers=`echo $ld_ver | sed -n \
-e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
fi
;;
esac
fi
fi
changequote([,])dnl
......@@ -2462,7 +2483,7 @@ elif test $in_tree_ld = yes ; then
&& test $in_tree_ld_is_elf = yes; then
comdat_group=yes
fi
elif test x"$ld_vers" != x; then
elif echo "$ld_ver" | grep GNU > /dev/null; then
comdat_group=yes
if test 0"$ld_date" -lt 20050308; then
if test -n "$ld_date"; then
......@@ -2475,9 +2496,32 @@ elif test x"$ld_vers" != x; then
fi
fi
else
# assume linkers other than GNU ld don't support COMDAT group
comdat_group=no
changequote(,)dnl
case "${target}" in
*-*-solaris2.1[1-9]*)
# Sun ld has COMDAT group support since Solaris 9, but it doesn't
# interoperate with GNU as until Solaris 11 build 130, i.e. ld
# version 1.688.
#
# FIXME: Maybe need to refine later when COMDAT group support with
# Sun as is implemented.
if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 1688; then
comdat_group=yes
else
comdat_group=no
fi
;;
*)
# Assume linkers other than GNU ld don't support COMDAT group.
comdat_group=no
;;
esac
changequote([,])dnl
fi
# Allow overriding the automatic COMDAT group tests above.
AC_ARG_ENABLE(comdat,
[AS_HELP_STRING([--enable-comdat], [enable COMDAT group support])],
[comdat_group="$enable_comdat"])
if test $comdat_group = no; then
gcc_cv_as_comdat_group=no
gcc_cv_as_comdat_group_percent=no
......
gcc/doc/install.texi
......@@ -1233,6 +1233,10 @@ This is the default for the m32r platform.
Specify that the user visible @command{cpp} program should be installed
in @file{@var{prefix}/@var{dirname}/cpp}, in addition to @var{bindir}.
@item --enable-comdat
Enable COMDAT group support. This is primarily used to override the
automatically detected value.
@item --enable-initfini-array
Force the use of sections @code{.init_array} and @code{.fini_array}
(instead of @code{.init} and @code{.fini}) for constructors and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment