[Python-checkins] cpython (merge 3.3 -> default): * Fix PART of issue 17192 for 3.4 - reapply the issue11729 patch

[gregory.p.smith]

http://hg.python.org/cpython/rev/e0fdc21c7d13
changeset:   83556:e0fdc21c7d13
parent:      83553:84cef4f1999a
parent:      83555:aa3371fa9773
user:        Gregory P. Smith <greg at krypto.org>
date:        Mon Apr 29 23:48:03 2013 -0700
summary:
  * Fix PART of issue 17192 for 3.4 - 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.

files:
  Modules/_ctypes/libffi/configure       |    6 +++---
  Modules/_ctypes/libffi/configure.ac    |    6 +++---
  Modules/_ctypes/libffi/doc/libffi.info |  Bin 
  3 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
@@ -14505,10 +14505,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 | grep -i 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
@@ -367,10 +367,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 | grep -i 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
diff --git a/Modules/_ctypes/libffi/doc/libffi.info b/Modules/_ctypes/libffi/doc/libffi.info
index 896a5ec0f1efe6231df04e22e25ec1e280b5e077..6d5acf830ac97ec0f11923d3e9808477900c8e29
GIT binary patch
[stripped]

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