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
This commit is contained in:
parent
5aac1dac62
commit
60c7f4ef5e
@ -1,5 +1,9 @@
|
||||
2003-01-31 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* 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.
|
||||
|
||||
* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
|
||||
Don't try to find graphics configuration.
|
||||
* java/awt/Toolkit.java (default_toolkit_name): Use new
|
||||
|
@ -249,3 +249,27 @@ AC_DEFUN([AM_LC_MESSAGES],
|
||||
[Define if your <locale.h> file defines 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
|
||||
|
24
libjava/aclocal.m4
vendored
24
libjava/aclocal.m4
vendored
@ -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.
|
||||
|
557
libjava/configure
vendored
557
libjava/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -394,6 +394,9 @@
|
||||
/* Define if the compiler is configured for setjmp/longjmp exceptions. */
|
||||
#undef SJLJ_EXCEPTIONS
|
||||
|
||||
/* Indicate that linker is not able to 8-byte align static data */
|
||||
#undef JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS
|
||||
|
||||
/* Required define if using POSIX threads */
|
||||
#undef _REENTRANT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user