diff --git a/ares/configure.ac b/ares/configure.ac
index 1629582eef5952bfc5749685765427d1ed9f89ad..5de956a76e2efedf1db6b7c86c228fae1119eec0 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -118,6 +118,10 @@ case $host in
     AC_MSG_RESULT([yes])
     with_pic=yes
     ;;
+  i686*linux*)
+    AC_MSG_RESULT([yes])
+    with_pic=yes
+    ;;
   *)
     AC_MSG_RESULT([no])
     ;;
diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index 9dea76b40edce0bce6438f092c998de76e10f6cc..a799f8c8e01fc541a8cbaa668992264b66b88d59 100644
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -915,6 +915,8 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
             tmp_CPPFLAGS="$tmp_CPPFLAGS -Wall -w2"
             dnl Perform extra compile-time code checking
             tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcheck"
+            dnl Generate inlining diagnostics
+            tmp_CPPFLAGS="$tmp_CPPFLAGS -Winline"
           fi
           dnl Disable using EBP register in optimizations
           tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer"
@@ -922,6 +924,12 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
           tmp_CFLAGS="$tmp_CFLAGS -fno-builtin"
           dnl Disable inlining of functions
           tmp_CFLAGS="$tmp_CFLAGS -fno-inline"
+          dnl Disable some IPO for single file optimizations
+          tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions"
+          dnl Disable inlining of standard library functions
+          tmp_CFLAGS="$tmp_CFLAGS -nolib-inline"
+          dnl Disable inlining of user-defined functions
+          tmp_CFLAGS="$tmp_CFLAGS -Ob0"
           dnl Enable floating-point stack integrity checks
           tmp_CFLAGS="$tmp_CFLAGS -fpstkchk"
           dnl Enable run-time detection of buffer overruns.
diff --git a/configure.ac b/configure.ac
index 789eae4c94ae821ca9ed2b064b36ec41544e5106..cf3b219ef640f19a459ed5fc3904f61667f4e134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,10 @@ case $host in
     AC_MSG_RESULT([yes])
     with_pic=yes
     ;;
+  i686*linux*)
+    AC_MSG_RESULT([yes])
+    with_pic=yes
+    ;;
   *)
     AC_MSG_RESULT([no])
     ;;
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index f43b582cf766cf323c945142250696d5307e0dd6..5061b0df780839b61c1ea6c5057d411ab7bdb4d6 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -921,6 +921,8 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
             tmp_CPPFLAGS="$tmp_CPPFLAGS -Wall -w2"
             dnl Perform extra compile-time code checking
             tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcheck"
+            dnl Generate inlining diagnostics
+            tmp_CPPFLAGS="$tmp_CPPFLAGS -Winline"
           fi
           dnl Disable using EBP register in optimizations
           tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer"
@@ -928,6 +930,12 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
           tmp_CFLAGS="$tmp_CFLAGS -fno-builtin"
           dnl Disable inlining of functions
           tmp_CFLAGS="$tmp_CFLAGS -fno-inline"
+          dnl Disable some IPO for single file optimizations
+          tmp_CFLAGS="$tmp_CFLAGS -fno-inline-functions"
+          dnl Disable inlining of standard library functions
+          tmp_CFLAGS="$tmp_CFLAGS -nolib-inline"
+          dnl Disable inlining of user-defined functions
+          tmp_CFLAGS="$tmp_CFLAGS -Ob0"
           dnl Enable floating-point stack integrity checks
           tmp_CFLAGS="$tmp_CFLAGS -fpstkchk"
           dnl Enable run-time detection of buffer overruns.