Commit 93305971 authored by Gregory P. Smith's avatar Gregory P. Smith

* Fix issue 17192 for 3.2 - reapply the issue11729 patch that was undone

  in the merge fun from upstream which already had it in 3.0.13.
* Add the missing update to libffi.info.
parent 11692acf
...@@ -14505,10 +14505,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; then : ...@@ -14505,10 +14505,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
libffi_cv_as_x86_pcrel=yes
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
libffi_cv_as_x86_pcrel=no libffi_cv_as_x86_pcrel=no
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
libffi_cv_as_x86_pcrel=yes
fi fi
fi fi
......
...@@ -367,10 +367,10 @@ fi ...@@ -367,10 +367,10 @@ fi
if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
AC_CACHE_CHECK([assembler supports pc related relocs], AC_CACHE_CHECK([assembler supports pc related relocs],
libffi_cv_as_x86_pcrel, [ libffi_cv_as_x86_pcrel, [
libffi_cv_as_x86_pcrel=yes
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
libffi_cv_as_x86_pcrel=no libffi_cv_as_x86_pcrel=no
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
libffi_cv_as_x86_pcrel=yes
fi fi
]) ])
if test "x$libffi_cv_as_x86_pcrel" = xyes; then if test "x$libffi_cv_as_x86_pcrel" = xyes; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment