From 6cf3abb170cca507c681dff4ef810f5d5da19588 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Wed, 21 Apr 2010 16:34:01 +0000 Subject: re PR libgcj/40860 (regressions in libjava testsuite on arm-linux) 2010-04-19 Andrew Haley PR libgcj/40860 * configure.ac: Handle --no-merge-exidx-entries. From-SVN: r158611 --- libjava/configure.ac | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index 255fb64..7f4befa 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -927,6 +927,21 @@ arm*linux*eabi) extra_ldflags_libjava=-liconv ;; esac + +# Check for --no-merge-exidx-entries, an ARM-specific linker option. +AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx], + [saved_ldflags="$LDFLAGS" + LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + AC_LINK_IFELSE([int main(void){ return 0;} ], + [eval "libgcj_cv_exidx=yes"], + [eval "libgcj_cv_exidx=no"]) + LDFLAGS="${saved_ldflags}"] +) +if test "${libgcj_cv_exidx}" = "yes"; then + SYSTEMSPEC="${SYSTEMSPEC} --no-merge-exidx-entries" + extra_ldflags="${extra_ldflags} -Wl,--no-merge-exidx-entries" +fi + AC_SUBST(extra_ldflags_libjava) AC_SUBST(extra_ldflags) AC_SUBST(LIBSTDCXXSPEC) -- cgit v1.1