[Python-checkins] cpython (3.3): Issue #11729: Backport commit bff052d9 from libffi upstream in order to fix

[stefan.krah]

http://hg.python.org/cpython/rev/190a115b7748
changeset:   81552:190a115b7748
branch:      3.3
parent:      81550:489f4e716b4b
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Jan 16 23:18:34 2013 +0100
summary:
  Issue #11729: Backport commit bff052d9 from libffi upstream in order to fix
a ctypes build failure with clang.

files:
  Modules/_ctypes/libffi/configure    |  6 +++---
  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
--- a/Modules/_ctypes/libffi/configure
+++ b/Modules/_ctypes/libffi/configure
@@ -14322,10 +14322,10 @@
   $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
--- a/Modules/_ctypes/libffi/configure.ac
+++ b/Modules/_ctypes/libffi/configure.ac
@@ -303,10 +303,10 @@
 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

-- 
Repository URL: http://hg.python.org/cpython