Fix C++ testsuite fallout from r252976.

gcc/testsuite/ChangeLog:

	PR c/81854
	* g++.dg/ext/attr-ifunc-2.C: Correct type errors.
	* g++.dg/ext/attr-ifunc-4.C: Ditto.
	* lib/target-supports.exp: Adjust for C++.

From-SVN: r253041

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd89f9ec878fd2bbec2e8bac7dd3240ee3767d9f..94696c91b9335f066bae26854b9224169a35c92f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2017-09-20  Martin Sebor  <msebor@redhat.com>
 
+       PR c/81854
+       * g++.dg/ext/attr-ifunc-2.C: Correct type errors.
+       * g++.dg/ext/attr-ifunc-4.C: Ditto.
+       * lib/target-supports.exp: Adjust for C++.
+
        PR c/81854
        * gcc.dg/attr-ifunc-1.c: Correct type errors.
        * gcc.dg/attr-ifunc-2.c: Ditto.
@@ -7,7 +12,7 @@
        * gcc.dg/attr-ifunc-4.c: Ditto.
        * gcc.dg/attr-ifunc-5.c: Ditto.
        * gcc.dg/pr81854.c: Require ifunc support.
-       * gcc/testsuite/lib/target-supports.exp: Correct type error.
+       * lib/target-supports.exp: Correct type error.
 
 2017-09-20  Jeff Law  <law@redhat.com>
 

diff --git a/gcc/testsuite/g++.dg/ext/attr-ifunc-2.C b/gcc/testsuite/g++.dg/ext/attr-ifunc-2.C
index 49872e0cbeaed2a4f9e4713d9b2396e6cb56b777..1fc940bb7ddf0f4d8462d23e30c1809ca01ef18b 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/attr-ifunc-2.C
+++ b/gcc/testsuite/g++.dg/ext/attr-ifunc-2.C
@@ -20,7 +20,7 @@ int Klass::implementation (void)
   return 0;
 }
 
-Klass::memFuncPtr Klass::resolver (void)
+Klass::MemFuncPtr Klass::resolver (void)
 {
   return &Klass::implementation;
 }

diff --git a/gcc/testsuite/g++.dg/ext/attr-ifunc-4.C b/gcc/testsuite/g++.dg/ext/attr-ifunc-4.C
index b8d8e5879b4cce3f5fa6c35edc8ff31e6d251a38..3127193147e16d191f017cce8822278110406d62 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/attr-ifunc-4.C
+++ b/gcc/testsuite/g++.dg/ext/attr-ifunc-4.C
@@ -14,7 +14,7 @@ struct Klassier : Klass
   int implementation ();
   int magic ();
 
-  typedef int (Klass::*MemFuncPtr)();
+  typedef int (Klassier::*MemFuncPtr)();
 
   static MemFuncPtr resolver ();
 };

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index f04687f382c1090789c1968d84de4d496e67b845..5b40058e2d70f5f2c932474da6b0268a2434fc13 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -437,11 +437,14 @@ proc check_effective_target_alias { } {
 proc check_ifunc_available { } {
     return [check_no_compiler_messages ifunc_available object {
        #ifdef __cplusplus
-       extern "C"
+       extern "C" {
        #endif
        typedef void F (void);
        F* g() {}
        void f() __attribute__((ifunc("g")));
+       #ifdef __cplusplus
+       }
+       #endif
     }]
 }