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

gcc/testsuite/ChangeLog

 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.
 	* gcc.dg/attr-ifunc-3.c: Ditto.
 	* 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>
 

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;
 }

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 ();
 };

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
     }]
 }