diff options
author | Tom Tromey <tromey@redhat.com> | 2003-01-31 17:59:00 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-01-31 17:59:00 +0000 |
commit | 60c7f4ef5edf29fc4d16a9d690397d0e007bd84d (patch) | |
tree | bc348a02e8d8ff111504c382b42de33176097ae9 /libjava/aclocal.m4 | |
parent | 5aac1dac6279f13c13e4068c4c734c48f0084205 (diff) | |
download | gcc-60c7f4ef5edf29fc4d16a9d690397d0e007bd84d.zip gcc-60c7f4ef5edf29fc4d16a9d690397d0e007bd84d.tar.gz gcc-60c7f4ef5edf29fc4d16a9d690397d0e007bd84d.tar.bz2 |
aclocal.m4, [...]: Rebuilt.
* aclocal.m4, configure, include/config.h.in: Rebuilt.
* acinclude.m4 (CHECK_FOR_BROKEN_MINGW_LD): Resurrected; was in
aclocal.m4 and lost in some merge.
From-SVN: r62188
Diffstat (limited to 'libjava/aclocal.m4')
-rw-r--r-- | libjava/aclocal.m4 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index c32821e..eea585e 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -262,6 +262,30 @@ AC_DEFUN([AM_LC_MESSAGES], fi fi]) +AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD], +[ +AC_MSG_CHECKING(whether 'ld' is at least 2.13) +LD_PROG=`$CC --print-prog-name=ld` +LD_VERSION=`$LD_PROG --version` +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` +if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then + LD_OK="ok" +else + if expr "$LD_VERSION_MAJOR" = 2 && expr "$LD_VERSION_MINOR" \>= 13 > /dev/null; then + LD_OK="ok" + fi +fi +if test "x$LD_OK" != x; then + AC_MSG_RESULT([yes; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) +else + AC_MSG_RESULT([no; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) + AC_MSG_WARN([ld <2.13 detected; enabling JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS hack...]) + AC_DEFINE(JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS, 1, + [Indicate that linker is not able to 8-byte align static data]) +fi[]dnl +])# CHECK_FOR_BROKEN_MINGW_LD + # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. |