diff --git a/aclocal.m4 b/aclocal.m4
index 94f34b36d69d..720e0d545712 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -490,6 +490,13 @@ AC_DEFUN([FP_SETTINGS],
 AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
 [
     AC_MSG_CHECKING([Setting up $2, $3, $4 and $5])
+    case $$1 in
+    i386-apple-darwin)
+        # Workaround for #7799
+        $2="$$2 -U__i686"
+        ;;
+    esac
+
     case $$1 in
     i386-apple-darwin)
         $2="$$2 -m32"