From 3fa5a557eb53bcf69bb6f18809d9394e7d0bca0e Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Tue, 18 Dec 2018 03:52:35 -0500
Subject: [PATCH] configure: Remove old -fno-gcse workaround for GCC 4.6.x and
 4.7.[012]

Now that we require at least GCC 4.8, we don't need this als workaround
for 4.6 and 4.7 anymore.

Backports commit d376e9de07e9541a040609d30b73403c33b6afe0 from qemu
---
 qemu/Makefile.target |  3 ---
 qemu/configure       | 17 +----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index 2c508e44..b59cc3ac 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -65,9 +65,6 @@ endif
 
 endif # CONFIG_SOFTMMU
 
-# Workaround for http://gcc.gnu.org/PR55489, see configure.
-%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
-
 dummy := $(call unnest-vars,,obj-y)
 all-obj-y := $(obj-y)
 
diff --git a/qemu/configure b/qemu/configure
index 02138edf..522900ff 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -813,21 +813,7 @@ else
   QEMU_CFLAGS="$QEMU_CFLAGS -Wno-missing-braces"
 fi
 
-# Workaround for http://gcc.gnu.org/PR55489.  Happens with -fPIE/-fPIC and
-# large functions that use global variables.  The bug is in all releases of
-# GCC, but it became particularly acute in 4.6.x and 4.7.x.  It is fixed in
-# 4.7.3 and 4.8.0.  We should be able to delete this at the end of 2013.
-cat > $TMPC << EOF
-#if __GNUC__ == 4 && (__GNUC_MINOR__ == 6 || (__GNUC_MINOR__ == 7 && __GNUC_PATCHLEVEL__ <= 2))
-int main(void) { return 0; }
-#else
-#error No bug in this compiler.
-#endif
-EOF
-if compile_prog "-Werror -fno-gcse" "" ; then
-  TRANSLATE_OPT_CFLAGS=-fno-gcse
-fi
-
+# Static linking is not possible with modules or PIE
 if test "$static" = "yes" ; then
   if test "$pie" = "yes" ; then
     error_exit "static and pie are mutually incompatible"
@@ -1595,7 +1581,6 @@ echo "LIBS+=$LIBS" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
 echo "DSOSUF=$DSOSUF" >> $config_host_mak
 echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
-echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak
 
 for target in $target_list; do
 target_dir="$target"