Tested on x86_64 darwin, pushed to trunk, thanks,
Iain
--- 8< ---
In some of the older testcases, the main function is declared like
main (int, void **). It is frequently useful (especially with the
Darwin port) to compare the output of clang with that of GCC (since
clang is the de-facto standard for Objective-C). Clang complains
about the void** so let's set that to be char ** as usual.
gcc/testsuite/ChangeLog:
* objc.dg/gnu-api-2-class.m: Replace void ** with char **
in the main function signature.
* objc.dg/gnu-api-2-ivar.m: Likewise.
* objc.dg/gnu-api-2-method.m: Likewise.
* objc.dg/gnu-api-2-objc.m: Likewise.
* objc.dg/gnu-api-2-objc_msg_lookup.m: Likewise.
* objc.dg/gnu-api-2-object.m: Likewise.
* objc.dg/gnu-api-2-property.m: Likewise.
* objc.dg/gnu-api-2-protocol.m: Likewise.
* objc.dg/gnu-api-2-resolve-method.m: Likewise.
* objc.dg/gnu-api-2-sel.m: Likewise.
* objc.dg/gnu-runtime-2.m: Likewise.
* objc.dg/gnu-runtime-3.m: Likewise.
* objc.dg/pr48177.m: Likewise.
* objc.dg/torture/strings/string1.m: Likewise.
* objc.dg/torture/strings/string2.m: Likewise.
* objc.dg/torture/strings/string3.m: Likewise.
* objc.dg/torture/strings/string4.m: Likewise.
Signed-off-by: Iain Sandoe <[email protected]>
---
gcc/testsuite/objc.dg/gnu-api-2-class.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-ivar.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-method.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-objc.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-objc_msg_lookup.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-object.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-property.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-protocol.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-resolve-method.m | 2 +-
gcc/testsuite/objc.dg/gnu-api-2-sel.m | 2 +-
gcc/testsuite/objc.dg/gnu-runtime-2.m | 2 +-
gcc/testsuite/objc.dg/gnu-runtime-3.m | 2 +-
gcc/testsuite/objc.dg/pr48177.m | 2 +-
gcc/testsuite/objc.dg/torture/strings/string1.m | 2 +-
gcc/testsuite/objc.dg/torture/strings/string2.m | 2 +-
gcc/testsuite/objc.dg/torture/strings/string3.m | 2 +-
gcc/testsuite/objc.dg/torture/strings/string4.m | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-class.m
b/gcc/testsuite/objc.dg/gnu-api-2-class.m
index d11dae0e6dc..c91ac5fd4f4 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-class.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-class.m
@@ -87,7 +87,7 @@ This algorithm is good enough for the small numbers (such as
8,
return result;
}
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-ivar.m
b/gcc/testsuite/objc.dg/gnu-api-2-ivar.m
index 072d2655bb8..dcd3272ef4e 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-ivar.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-ivar.m
@@ -47,7 +47,7 @@ - (id) variable { return variable_ivar; }
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-method.m
b/gcc/testsuite/objc.dg/gnu-api-2-method.m
index ea1da8d138f..bd8da218cd8 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-method.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-method.m
@@ -49,7 +49,7 @@ - (id) constant { return nil; }
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-objc.m
b/gcc/testsuite/objc.dg/gnu-api-2-objc.m
index e9ec5d7ab94..58d4ea9f1d1 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-objc.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-objc.m
@@ -68,7 +68,7 @@ This algorithm is good enough for the small numbers (such as
8,
return result;
}
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-objc_msg_lookup.m
b/gcc/testsuite/objc.dg/gnu-api-2-objc_msg_lookup.m
index d417225cdfb..307dade18d5 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-objc_msg_lookup.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-objc_msg_lookup.m
@@ -40,7 +40,7 @@ @implementation MySubClass
- (int) test { return 11; }
@end
-int main (int argc, void **args)
+int main (int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-object.m
b/gcc/testsuite/objc.dg/gnu-api-2-object.m
index 20c4342d267..9db012dbc27 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-object.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-object.m
@@ -56,7 +56,7 @@ - (id) test { return self; }
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-property.m
b/gcc/testsuite/objc.dg/gnu-api-2-property.m
index 0ef4d79f9b3..4fc8d3b0a4e 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-property.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-property.m
@@ -41,7 +41,7 @@ @implementation MySubClass
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-protocol.m
b/gcc/testsuite/objc.dg/gnu-api-2-protocol.m
index 682adcd716e..3fc7f1cbaf0 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-protocol.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-protocol.m
@@ -51,7 +51,7 @@ - (id) variable { return variable_ivar; }
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-resolve-method.m
b/gcc/testsuite/objc.dg/gnu-api-2-resolve-method.m
index 6eaa3dd72a3..e2005b9911d 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-resolve-method.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-resolve-method.m
@@ -165,7 +165,7 @@ @interface SelfExtendingClass (NonExistingStuff)
<NonExistingStuff2>
@end
-int main (int argc, void **args)
+int main (int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-api-2-sel.m
b/gcc/testsuite/objc.dg/gnu-api-2-sel.m
index bc581bec2f7..1a721635cc6 100644
--- a/gcc/testsuite/objc.dg/gnu-api-2-sel.m
+++ b/gcc/testsuite/objc.dg/gnu-api-2-sel.m
@@ -63,7 +63,7 @@ @implementation ClassB
- (void) conflictingSelectorMethod { return; }
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
/* Functions are tested in alphabetical order. */
diff --git a/gcc/testsuite/objc.dg/gnu-runtime-2.m
b/gcc/testsuite/objc.dg/gnu-runtime-2.m
index 9903d29727c..f34320f5cc9 100644
--- a/gcc/testsuite/objc.dg/gnu-runtime-2.m
+++ b/gcc/testsuite/objc.dg/gnu-runtime-2.m
@@ -22,7 +22,7 @@ -(const char *) cString { return c_string; }
-(unsigned int) length { return len; }
@end
-int main(int argc, void **args)
+int main(int argc, char **args)
{
if (strcmp ([@"this is a string" cString], "this is a string"))
abort ();
diff --git a/gcc/testsuite/objc.dg/gnu-runtime-3.m
b/gcc/testsuite/objc.dg/gnu-runtime-3.m
index d26f48cf980..6ed5d9739a6 100644
--- a/gcc/testsuite/objc.dg/gnu-runtime-3.m
+++ b/gcc/testsuite/objc.dg/gnu-runtime-3.m
@@ -7,7 +7,7 @@
#include <string.h>
#include <stdlib.h>
-int main(int argc, void **args)
+int main(int argc, char **args)
{
[TestsuiteObject new];
return 0;
diff --git a/gcc/testsuite/objc.dg/pr48177.m b/gcc/testsuite/objc.dg/pr48177.m
index 0d7ff2979c4..1f9d562b51c 100644
--- a/gcc/testsuite/objc.dg/pr48177.m
+++ b/gcc/testsuite/objc.dg/pr48177.m
@@ -5,7 +5,7 @@
#include <objc/runtime.h>
#include <stdlib.h>
-int main(int argc, void **args)
+int main(int argc, char **args)
{
#ifdef __GNU_LIBOBJC__
/* This special test tests that, if you have a selector already
diff --git a/gcc/testsuite/objc.dg/torture/strings/string1.m
b/gcc/testsuite/objc.dg/torture/strings/string1.m
index 455b5f1bff1..e0686330977 100644
--- a/gcc/testsuite/objc.dg/torture/strings/string1.m
+++ b/gcc/testsuite/objc.dg/torture/strings/string1.m
@@ -14,7 +14,7 @@
#include "../../../objc-obj-c++-shared/nsconstantstring-class.h"
#endif
-int main(int argc, void **args)
+int main(int argc, char **args)
{
if (strcmp ([@"this is a string" cString], "this is a string"))
abort ();
diff --git a/gcc/testsuite/objc.dg/torture/strings/string2.m
b/gcc/testsuite/objc.dg/torture/strings/string2.m
index 030ba602db5..51b9a546e7c 100644
--- a/gcc/testsuite/objc.dg/torture/strings/string2.m
+++ b/gcc/testsuite/objc.dg/torture/strings/string2.m
@@ -14,7 +14,7 @@
#include "../../../objc-obj-c++-shared/nsconstantstring-class.h"
#endif
-int main(int argc, void **args)
+int main(int argc, char **args)
{
if (strcmp ([@"this " @"is " @"a " @"string" cString],
"this " "is " "a " "string"))
diff --git a/gcc/testsuite/objc.dg/torture/strings/string3.m
b/gcc/testsuite/objc.dg/torture/strings/string3.m
index b08dfb242b3..3b0acd01e08 100644
--- a/gcc/testsuite/objc.dg/torture/strings/string3.m
+++ b/gcc/testsuite/objc.dg/torture/strings/string3.m
@@ -16,7 +16,7 @@
#define STRING "this is a string"
-int main (int argc, void **args)
+int main (int argc, char **args)
{
if (strcmp ([@STRING cString], STRING))
abort ();
diff --git a/gcc/testsuite/objc.dg/torture/strings/string4.m
b/gcc/testsuite/objc.dg/torture/strings/string4.m
index 425ccc080ea..0e3eada58a4 100644
--- a/gcc/testsuite/objc.dg/torture/strings/string4.m
+++ b/gcc/testsuite/objc.dg/torture/strings/string4.m
@@ -14,7 +14,7 @@
#include "../../../objc-obj-c++-shared/nsconstantstring-class.h"
#endif
-int main(int argc, void **args)
+int main(int argc, char **args)
{
if ([@"this is a string" length] != strlen ("this is a string"))
abort ();
--
2.50.1 (Apple Git-155)
