diff options
| author | Stefan Krah <skrah@bytereef.org> | 2013-01-16 22:25:41 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2013-01-16 22:25:41 (GMT) |
| commit | 31efb380b319c90726b2dbad486fc1f869336953 (patch) | |
| tree | 7a9c0bd1b57f16df5000df10c7cc4e14a2ea8e38 /Modules/_ctypes | |
| parent | bb17b4a90f13d60261e08b70f7b07987142f4536 (diff) | |
| parent | 897c3e994f7ae7a219c5956d304f75ba8dec1583 (diff) | |
| download | cpython-31efb380b319c90726b2dbad486fc1f869336953.zip cpython-31efb380b319c90726b2dbad486fc1f869336953.tar.gz cpython-31efb380b319c90726b2dbad486fc1f869336953.tar.bz2 | |
Merge 3.3.
Diffstat (limited to 'Modules/_ctypes')
| -rwxr-xr-x | Modules/_ctypes/libffi/configure | 6 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi/configure.ac | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure index c86a597..5aacf9b 100755 --- a/Modules/_ctypes/libffi/configure +++ b/Modules/_ctypes/libffi/configure @@ -14322,10 +14322,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; then : $as_echo_n "(cached) " >&6 else - libffi_cv_as_x86_pcrel=yes + libffi_cv_as_x86_pcrel=no 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 - libffi_cv_as_x86_pcrel=no + if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then + libffi_cv_as_x86_pcrel=yes fi fi diff --git a/Modules/_ctypes/libffi/configure.ac b/Modules/_ctypes/libffi/configure.ac index d8652aa..c16bcb5 100644 --- a/Modules/_ctypes/libffi/configure.ac +++ b/Modules/_ctypes/libffi/configure.ac @@ -303,10 +303,10 @@ fi if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then AC_CACHE_CHECK([assembler supports pc related relocs], 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 - if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then - libffi_cv_as_x86_pcrel=no + if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then + libffi_cv_as_x86_pcrel=yes fi ]) if test "x$libffi_cv_as_x86_pcrel" = xyes; then |