- The pic/no-pic patch by Joe Orton.

diff --git a/configure.in b/configure.in
index fa545c18d3e91f3c58e1cadc2cec4ce8dd3aec85..2ef41451c7f8bf7f2a7cf188889fcd606aad98e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -202,6 +202,21 @@ case $host_alias in
     ;;
 esac
 
+# Disable PIC mode by default where it is known to be safe to do so,
+# to avoid the performance hit from the lost register
+AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
+case $host_alias in
+i?86-*-linux*|i?86-*-freebsd*)
+    if test "${with_pic+set}" != "set"; then
+      with_pic=no
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+    ;;
+*) AC_MSG_RESULT(no) ;;
+esac
+
 
 dnl Include Zend and TSRM configurations.
 dnl -------------------------------------------------------------------------
@@ -849,7 +864,6 @@ fi
 
 enable_shared=yes
 enable_static=yes
-unset with_pic
 
 case $php_build_target in
 program|static)
@@ -860,7 +874,9 @@ program|static)
 ;;
 shared)
     enable_static=no
-    standard_libtool_flag=-prefer-pic
+    if test "${with_pic+set}" != "set"; then
+      standard_libtool_flag='-prefer-pic'
+    fi
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
 ;;
 esac