OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/40860 (regressions in libjava testsuite on arm-linux) 

2010-04-19  Andrew Haley  <aph@redhat.com>

        PR libgcj/40860
        * configure.ac: Handle --no-merge-exidx-entries.

From-SVN: r158614
This commit is contained in:
Andrew Haley 2010-04-21 17:04:42 +00:00 committed by Andrew Haley
parent 2e1fdf999d
commit fcc4c42256
3 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2010-04-19 Andrew Haley <aph@redhat.com>
PR libgcj/40860
* configure.ac: Handle --no-merge-exidx-entries.
2010-04-08 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Backport:

58
libjava/configure vendored
View File

@ -20667,6 +20667,64 @@ arm*linux*eabi)
;;
esac
# Check for --no-merge-exidx-entries, an ARM-specific linker option.
echo "$as_me:$LINENO: checking for --no-merge-exidx-entries" >&5
echo $ECHO_N "checking for --no-merge-exidx-entries... $ECHO_C" >&6
if test "${libgcj_cv_exidx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
saved_ldflags="$LDFLAGS"
LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries"
if test x$gcc_no_link = xyes; then
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
{ (exit 1); exit 1; }; }
fi
cat >conftest.$ac_ext <<_ACEOF
int main(void){ return 0;}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "libgcj_cv_exidx=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "libgcj_cv_exidx=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="${saved_ldflags}"
fi
echo "$as_me:$LINENO: result: $libgcj_cv_exidx" >&5
echo "${ECHO_T}$libgcj_cv_exidx" >&6
if test "${libgcj_cv_exidx}" = "yes"; then
SYSTEMSPEC="${SYSTEMSPEC} --no-merge-exidx-entries"
extra_ldflags="${extra_ldflags} -Wl,--no-merge-exidx-entries"
fi

15
libjava/configure.ac
View File

@ -888,6 +888,21 @@ arm*linux*eabi)
LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -L`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -rpath `${PWDCMD-pwd}`/.libs:`${PWDCMD-pwd}`/../libstdc++-v3/src/.libs -lstdc++"
;;
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)