From 1761a10645dadc0840bf1ff3a4998f9a342e8cad Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Fri, 22 Nov 2019 18:53:09 -0500
Subject: [PATCH] Remove gccbug detection.  GCC is good now.

---
 testsuite/lib/libffi.exp                 | 19 +------------------
 testsuite/libffi.bhaible/bhaible.exp     |  1 -
 testsuite/libffi.bhaible/test-call.c     |  2 --
 testsuite/libffi.bhaible/test-callback.c |  2 --
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
index a244051..c02adf9 100644
--- a/testsuite/lib/libffi.exp
+++ b/testsuite/lib/libffi.exp
@@ -24,11 +24,6 @@ load_lib libgloss.exp
 load_gcc_lib target-libpath.exp
 load_gcc_lib wrapper.exp
 
-proc check_effective_target_gccbug { } {
-    global has_gccbug
-    return $has_gccbug
-}
-
 # Return 1 if the target matches the effective target 'arg', 0 otherwise.
 # This can be used with any check_* proc that takes no argument and
 # returns only 1 or 0.  It could be used with check_* procs that take
@@ -482,7 +477,6 @@ proc libffi-dg-runtest { testcases default-extra-flags } {
 
 proc run-many-tests { testcases extra_flags } {
     global compiler_vendor
-    global has_gccbug
     global env
     switch $compiler_vendor {
       "clang" {
@@ -498,7 +492,7 @@ proc run-many-tests { testcases extra_flags } {
         if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
 	  set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
         } else { 
-          set optimizations { "-O0" "-O2" "-O2 -fomit-frame-pointer" }
+          set optimizations { "-O0" "-O2" }
         }
       }
       default {
@@ -544,17 +538,6 @@ proc run-many-tests { testcases extra_flags } {
         foreach opt $optimizations {
             foreach abi $abis {
                 set options [concat $common $opt $abi]
-		set has_gccbug false;
-		if { [string match $compiler_vendor "gnu"] \
-			 && [string match "*MSABI*" $abi] \
-			 && ( ( [string match "*DGTEST=57 *" $common] \
-				    && [string match "*call.c*" $testname] ) \
-				  || ( [string match "*DGTEST=54 *" $common] \
-					   && [string match "*callback*" $testname] ) \
-				  || [string match "*DGTEST=55 *" $common] \
-				  || [string match "*DGTEST=56 *" $common] ) } then {
-		    set has_gccbug true;
-		}
                 verbose "Testing $testname, $options" 1
                 dg-test $test $options ""
             }
diff --git a/testsuite/libffi.bhaible/bhaible.exp b/testsuite/libffi.bhaible/bhaible.exp
index 4e5051b..3522bd4 100644
--- a/testsuite/libffi.bhaible/bhaible.exp
+++ b/testsuite/libffi.bhaible/bhaible.exp
@@ -19,7 +19,6 @@ libffi-init
 
 global srcdir subdir
 global compiler_vendor
-global has_gccbug
 
 # The conversion of this testsuite into a dejagnu compatible testsuite
 # was done in a pretty lazy fashion, and requires the use of compiler
diff --git a/testsuite/libffi.bhaible/test-call.c b/testsuite/libffi.bhaible/test-call.c
index caa77de..251a973 100644
--- a/testsuite/libffi.bhaible/test-call.c
+++ b/testsuite/libffi.bhaible/test-call.c
@@ -16,8 +16,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-/* { dg-do run { xfail gccbug } }*/
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testsuite/libffi.bhaible/test-callback.c b/testsuite/libffi.bhaible/test-callback.c
index 67a8145..64f3a01 100644
--- a/testsuite/libffi.bhaible/test-callback.c
+++ b/testsuite/libffi.bhaible/test-callback.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* { dg-do run { xfail gccbug } }*/
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-- 
2.7.4