traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.3.

This commit is contained in:
Stefan Krah 2013-01-16 23:25:41 +01:00
parent bb17b4a90f 897c3e994f
commit 31efb380b3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_ctypes/libffi/configure vendored
View File

@ -14322,10 +14322,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 libffi_cv_as_x86_pcrel=no
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
libffi_cv_as_x86_pcrel=no libffi_cv_as_x86_pcrel=yes
fi fi
fi fi

6
Modules/_ctypes/libffi/configure.ac
View File

@ -303,10 +303,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 libffi_cv_as_x86_pcrel=no
echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
libffi_cv_as_x86_pcrel=no 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