merge 4.05 into trunk

1 files changed, 10 insertions, 0 deletions

diff --git a/configure b/configure
index 44a7b099b4..abc0e83a2a 100755
--- a/configure
+++ b/configure
@@ -877,6 +877,16 @@ else
 fi
 
 
+# Try to work around the Skylake/Kaby Lake processor bug.
+case "$bytecc,$target" in
+    *gcc*,x86_64-*|*gcc*,i686-*)
+        if sh ./hasgot -Werror -fno-tree-vrp; then
+            byteccprivatecompopts="$byteccprivatecompopts -fno-tree-vrp"
+            inf "Adding -fno-tree-vrp option to work around PR#7452"
+        fi;;
+esac
+
+
 # Configure the native-code compiler
 
 arch=none