PR testsuite/23611, PR testsuite/23615

	PR testsuite/23611, PR testsuite/23615
	* obj-c++.dg/bitfield-3.mm: Include standard headers instead of
	writing prototypes of library functions by hand.
	* obj-c++.dg/bitfield-4.mm: Likewise.
	* obj-c++.dg/const-str-4.mm: Likewise.
	* obj-c++.dg/encode-4.mm: Likewise.
	* obj-c++.dg/encode-5.mm: Likewise.
	* obj-c++.dg/encode-6.mm: Likewise.
	* obj-c++.dg/gnu-runtime-3.mm: Likewise.
	* obj-c++.dg/method-10.mm: Likewise.
	* obj-c++.dg/method-17.mm: Likewise.
	* obj-c++.dg/method-19.mm: Likewise.
	* obj-c++.dg/try-catch-2.mm: Likewise.

From-SVN: r105074

12 files changed, 39 insertions, 29 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f362685..44e8a7a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2005-10-07  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	PR testsuite/23611, PR testsuite/23615
+	* obj-c++.dg/bitfield-3.mm: Include standard headers instead of
+	writing prototypes of library functions by hand.
+	* obj-c++.dg/bitfield-4.mm: Likewise.
+	* obj-c++.dg/const-str-4.mm: Likewise.
+	* obj-c++.dg/encode-4.mm: Likewise.
+	* obj-c++.dg/encode-5.mm: Likewise.
+	* obj-c++.dg/encode-6.mm: Likewise.
+	* obj-c++.dg/gnu-runtime-3.mm: Likewise.
+	* obj-c++.dg/method-10.mm: Likewise.
+	* obj-c++.dg/method-17.mm: Likewise.
+	* obj-c++.dg/method-19.mm: Likewise.
+	* obj-c++.dg/try-catch-2.mm: Likewise.
+
 2005-10-06  Richard Henderson  <rth@redhat.com>
 
 	PR 24236
diff --git a/gcc/testsuite/obj-c++.dg/bitfield-3.mm b/gcc/testsuite/obj-c++.dg/bitfield-3.mm
index d607a3e..1ad10f6 100644
--- a/gcc/testsuite/obj-c++.dg/bitfield-3.mm
+++ b/gcc/testsuite/obj-c++.dg/bitfield-3.mm
@@ -6,10 +6,8 @@
 
 typedef struct objc_object { struct objc_class *class_pointer; } *id;
 
-extern "C" {
-  extern void abort(void);
-  extern int strcmp(const char *, const char *);
-}
+#include <stdlib.h>
+#include <string.h>
 
 #define CHECK_IF(expr) if(!(expr)) abort();
 
diff --git a/gcc/testsuite/obj-c++.dg/bitfield-4.mm b/gcc/testsuite/obj-c++.dg/bitfield-4.mm
index 4aa2a8b..d7617bf 100644
--- a/gcc/testsuite/obj-c++.dg/bitfield-4.mm
+++ b/gcc/testsuite/obj-c++.dg/bitfield-4.mm
@@ -6,10 +6,9 @@
 
 #include <objc/Object.h>
 
-extern "C" {
-  extern void abort(void);
-  extern int strcmp(const char *str1, const char *str2);
-}
+#include <stdlib.h>
+#include <string.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 enum Enum { one, two, three, four };
diff --git a/gcc/testsuite/obj-c++.dg/const-str-4.mm b/gcc/testsuite/obj-c++.dg/const-str-4.mm
index df53c23..9ea257d 100644
--- a/gcc/testsuite/obj-c++.dg/const-str-4.mm
+++ b/gcc/testsuite/obj-c++.dg/const-str-4.mm
@@ -3,7 +3,7 @@
 /* { dg-options "-fnext-runtime -fconstant-string-class=MyString -lobjc" } */ 
 /* { dg-do run { target *-*-darwin* } } */
 
-extern "C" void abort(void);
+#include <stdlib.h>
 
 @interface MyString
 {
diff --git a/gcc/testsuite/obj-c++.dg/encode-4.mm b/gcc/testsuite/obj-c++.dg/encode-4.mm
index 25c0b50..66745f0 100644
--- a/gcc/testsuite/obj-c++.dg/encode-4.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-4.mm
@@ -31,10 +31,9 @@
 #define CLASS_GETINSTANCEMETHOD class_get_instance_method
 #endif
 
-extern "C" {
-  extern int sscanf(const char *str, const char *format, ...);
-  extern void abort(void);
-}
+#include <stdio.h>
+#include <stdlib.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 @interface Foo: Object
diff --git a/gcc/testsuite/obj-c++.dg/encode-5.mm b/gcc/testsuite/obj-c++.dg/encode-5.mm
index 9a36326..748df7c 100644
--- a/gcc/testsuite/obj-c++.dg/encode-5.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-5.mm
@@ -13,10 +13,9 @@
 #include <objc/objc-api.h>
 #endif
 
-extern "C" {
-  extern int sscanf(const char *str, const char *format, ...);
-  extern void abort(void);
-}
+#include <stdio.h>
+#include <stdlib.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 enum Enum {
diff --git a/gcc/testsuite/obj-c++.dg/encode-6.mm b/gcc/testsuite/obj-c++.dg/encode-6.mm
index 1ee1171..5b85c3d 100644
--- a/gcc/testsuite/obj-c++.dg/encode-6.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-6.mm
@@ -12,10 +12,9 @@
 #define OBJC_GETCLASS objc_get_class
 #endif
 
-extern "C" {
-  extern void abort(void);
-  extern int strcmp(const char *s1, const char *s2);
-}
+#include <stdlib.h>
+#include <string.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 @class Int1, Int2;
diff --git a/gcc/testsuite/obj-c++.dg/gnu-runtime-3.mm b/gcc/testsuite/obj-c++.dg/gnu-runtime-3.mm
index 5a086ea..d9c62d9 100644
--- a/gcc/testsuite/obj-c++.dg/gnu-runtime-3.mm
+++ b/gcc/testsuite/obj-c++.dg/gnu-runtime-3.mm
@@ -5,13 +5,13 @@
 /* { dg-options "-fgnu-runtime" } */
 
 #include <objc/Object.h>
+#include <stdlib.h>
 
 @interface FooBar: Object
 - (void)boo;
 @end
 
 int called = 0;
-extern "C" void abort ();
 
 @implementation FooBar
 - (void)boo
diff --git a/gcc/testsuite/obj-c++.dg/method-10.mm b/gcc/testsuite/obj-c++.dg/method-10.mm
index 4c7ccb8..01a568b 100644
--- a/gcc/testsuite/obj-c++.dg/method-10.mm
+++ b/gcc/testsuite/obj-c++.dg/method-10.mm
@@ -4,8 +4,8 @@
 /* { dg-do run } */
 
 #include <objc/Object.h>
+#include <stdlib.h>
 
-extern "C" void abort(void);
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 @interface Int1: Object
diff --git a/gcc/testsuite/obj-c++.dg/method-17.mm b/gcc/testsuite/obj-c++.dg/method-17.mm
index 556830f..a7f27f8 100644
--- a/gcc/testsuite/obj-c++.dg/method-17.mm
+++ b/gcc/testsuite/obj-c++.dg/method-17.mm
@@ -5,7 +5,8 @@
 /* { dg-do run } */
 
 #include <objc/Object.h>
-extern "C" void abort(void);
+#include <stdlib.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 static double d = 4.5920234e2;
diff --git a/gcc/testsuite/obj-c++.dg/method-19.mm b/gcc/testsuite/obj-c++.dg/method-19.mm
index 55890f5..e7a2b44 100644
--- a/gcc/testsuite/obj-c++.dg/method-19.mm
+++ b/gcc/testsuite/obj-c++.dg/method-19.mm
@@ -14,10 +14,9 @@
 #define OBJC_GETCLASS objc_get_class
 #endif
 
-extern "C" {
-  extern void abort(void);
-  extern int strcmp(const char *, const char *);
-}
+#include <stdlib.h>
+#include <string.h>
+
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 @protocol Proto
diff --git a/gcc/testsuite/obj-c++.dg/try-catch-2.mm b/gcc/testsuite/obj-c++.dg/try-catch-2.mm
index 77ef153..9352260 100644
--- a/gcc/testsuite/obj-c++.dg/try-catch-2.mm
+++ b/gcc/testsuite/obj-c++.dg/try-catch-2.mm
@@ -7,13 +7,13 @@
 
 #include <objc/Object.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 /* The following is not required in actual user code; we include it
    here to check that the compiler generates an internal definition of
    _setjmp that is consistent with what <setjmp.h> provides.  */
 #include <setjmp.h>
 
-extern "C" void abort(void);
 #define CHECK_IF(expr) if(!(expr)) abort()
 
 @interface Frob: Object