* m4/pr40134.m4: Added a configure switch for ARM linker problem.

* configure.ac, src/cacao/Makefile.am: Use it.

diff --git a/configure.ac b/configure.ac
index 41853414f0d10090f961bea259247713ae1116c5..5a8539f57372d1a0130f29ecb2b7c315d0f2c368 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -657,6 +657,8 @@ AZ_PYTHON_VERSION_ENSURE( [2.4] )
 AZ_PYTHON_CSPEC
 AZ_PYTHON_LSPEC
 
+AC_CHECK_ENABLE_GCC_PR40134
+
 dnl Define version numbers.
 AC_VERSION_DETAIL
 AC_VERSION_CONFIG

diff --git a/m4/pr40134.m4 b/m4/pr40134.m4
new file mode 100644 (file)
index 0000000..f2200b6
--- /dev/null
+++ b/m4/pr40134.m4
@@ -0,0 +1,35 @@
+dnl m4/pr40134.m4
+dnl
+dnl Copyright (C) 2010
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+dnl 
+dnl This file is part of CACAO.
+dnl 
+dnl This program is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2, or (at
+dnl your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+
+
+AC_DEFUN([AC_CHECK_ENABLE_GCC_PR40134],[
+AC_MSG_CHECKING([for gcc PR40134 workaround])
+AC_ARG_ENABLE([pr40134-workaround],
+              [AS_HELP_STRING(--enable-pr40134-workaround,[enable workaround for gcc PR40134, may be required on ARM] [[default=no]])],
+              [case "${enableval}" in
+                   yes) ENABLE_PR40134=yes;;
+                   *) ENABLE_PR40134=no;;
+               esac],
+              [ENABLE_PR40134=no])
+AC_MSG_RESULT(${ENABLE_PR40134})
+AM_CONDITIONAL([GCC_PR40134], [test x"${ENABLE_PR40134}" = "xyes"])
+])

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 0f59f3228b95e4d90472c359f992b8cae152cd2a..34a81cbfbcc2891e912498f4209fa10e1de253d4 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -48,6 +48,10 @@ libjvm_la_LDFLAGS += \
 endif
 endif
 
+if GCC_PR40134
+libjvm_la_LDFLAGS += -lgcc
+endif
+
 cacao_LDFLAGS += \
        -export-dynamic