This patch is a cleanup of tests in gcc.dg/tm/ directory.
See https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02656.html for more info.

Tested on x86_64-linux: vanilla results == results with this patch ==
results with this patch and gnu11 as a default.

Ok?

2014-10-02  Marek Polacek  <pola...@redhat.com>

        * gcc.dg/tm/20091013.c: Fix defaulting to int.
        * gcc.dg/tm/20091221.c: Likewise.
        * gcc.dg/tm/debug-1.c: Likewise.
        * gcc.dg/tm/irrevocable-1.c: Likewise.
        * gcc.dg/tm/irrevocable-2.c: Likewise.
        * gcc.dg/tm/irrevocable-3.c: Likewise.
        * gcc.dg/tm/irrevocable-4.c: Likewise.
        * gcc.dg/tm/memopt-1.c: Likewise.
        * gcc.dg/tm/pr52173-1.c: Likewise.
        * gcc.dg/tm/props-1.c: Likewise.
        * gcc.dg/tm/props-2.c: Likewise.
        * gcc.dg/tm/props-3.c: Likewise.
        * gcc.dg/tm/20100125.c: Fix implicit declarations.
        * gcc.dg/tm/memopt-11.c: Likewise.
        * gcc.dg/tm/memopt-12.c: Likewise.
        * gcc.dg/tm/memopt-16.c: Likewise.
        * gcc.dg/tm/memopt-3.c: Likewise.
        * gcc.dg/tm/memopt-4.c: Likewise.
        * gcc.dg/tm/memopt-5.c: Likewise.
        * gcc.dg/tm/memopt-6.c: Likewise.
        * gcc.dg/tm/wrap-4.c: Likewise.

diff --git gcc/gcc/testsuite/gcc.dg/tm/20091013.c 
gcc/gcc/testsuite/gcc.dg/tm/20091013.c
index d9b3b0e..3c67a82 100644
--- gcc/gcc/testsuite/gcc.dg/tm/20091013.c
+++ gcc/gcc/testsuite/gcc.dg/tm/20091013.c
@@ -4,6 +4,7 @@
 extern long ringo(long int);
 int g,i;
 
+void
 f()
 {
   __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/20091221.c 
gcc/gcc/testsuite/gcc.dg/tm/20091221.c
index 1d75d15..4751f2b 100644
--- gcc/gcc/testsuite/gcc.dg/tm/20091221.c
+++ gcc/gcc/testsuite/gcc.dg/tm/20091221.c
@@ -4,6 +4,7 @@
 int i;
 extern void virgin () __attribute__((transaction_pure));
 
+void
 foo()
 {
        __transaction_atomic {
diff --git gcc/gcc/testsuite/gcc.dg/tm/20100125.c 
gcc/gcc/testsuite/gcc.dg/tm/20100125.c
index 3f1dd10..3b3d2b9 100644
--- gcc/gcc/testsuite/gcc.dg/tm/20100125.c
+++ gcc/gcc/testsuite/gcc.dg/tm/20100125.c
@@ -3,6 +3,7 @@
 
 /* Test that the call to george() doesn't end up inside the transaction.  */
 
+void george (void);
 int trxn;
 
 void set_remove(int * val)
diff --git gcc/gcc/testsuite/gcc.dg/tm/debug-1.c 
gcc/gcc/testsuite/gcc.dg/tm/debug-1.c
index 01acfae..bccc0b3 100644
--- gcc/gcc/testsuite/gcc.dg/tm/debug-1.c
+++ gcc/gcc/testsuite/gcc.dg/tm/debug-1.c
@@ -5,11 +5,11 @@
 
 int a,b, c, z;
 
-testing(){
+void testing(){
     c=9;
 }
 
-main() {
+int main() {
        b = 9898;
        __transaction_relaxed {
                z = c;
diff --git gcc/gcc/testsuite/gcc.dg/tm/irrevocable-1.c 
gcc/gcc/testsuite/gcc.dg/tm/irrevocable-1.c
index 60f6291..9f9fe3a 100644
--- gcc/gcc/testsuite/gcc.dg/tm/irrevocable-1.c
+++ gcc/gcc/testsuite/gcc.dg/tm/irrevocable-1.c
@@ -4,8 +4,9 @@
 int global;
 int george;
 
-extern crap() __attribute__((transaction_unsafe));
+extern void crap() __attribute__((transaction_unsafe));
 
+void
 foo()
 {
        __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/irrevocable-2.c 
gcc/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
index 17ac8a5..9b1127f 100644
--- gcc/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
+++ gcc/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
@@ -7,6 +7,7 @@
 int global;
 int george;
 
+void
 foo()
 {
        __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/irrevocable-3.c 
gcc/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
index fdf3e52..9a9903c 100644
--- gcc/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
+++ gcc/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
@@ -3,6 +3,7 @@
 
 extern void bar(void) __attribute__((transaction_callable));
 
+void
 foo()
 {
        __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/irrevocable-4.c 
gcc/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
index 72075df..ee48f82 100644
--- gcc/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
+++ gcc/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
@@ -4,7 +4,7 @@
 void orig(void);
 void xyz(void) __attribute__((transaction_wrap (orig)));
 
-
+void
 foo()
 {
        __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-1.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-1.c
index c5ac5ce..ac88ebd 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-1.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-1.c
@@ -2,10 +2,11 @@
 /* { dg-options "-fgnu-tm -O -fdump-tree-tmmemopt" } */
 
 long g, xxx, yyy;
-extern george() __attribute__((transaction_safe));
-extern ringo(long int) __attribute__((transaction_safe));
+extern void george() __attribute__((transaction_safe));
+extern void ringo(long int) __attribute__((transaction_safe));
 int i;
 
+void
 f()
 {
   __transaction_relaxed {
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-11.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-11.c
index 36aa664..0c96f0e 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-11.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-11.c
@@ -3,6 +3,7 @@
 
 extern int something(void) __attribute__((transaction_safe));
 extern void *malloc (__SIZE_TYPE__) __attribute__((malloc,transaction_safe));
+extern void foo (int);
 
 int f()
 {
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-12.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-12.c
index 5520ece..4278816 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-12.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-12.c
@@ -2,6 +2,7 @@
 /* { dg-options "-fgnu-tm -O -fdump-tree-tmmark" } */
 
 extern int test(void) __attribute__((transaction_safe));
+extern int something (void);
 extern void *malloc (__SIZE_TYPE__) __attribute__((malloc,transaction_safe));
 
 struct large { int foo[500]; };
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-16.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-16.c
index c230240..44ae3d4 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-16.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-16.c
@@ -4,6 +4,7 @@
    it to be converted into a COND_EXPR.  */
 
 extern int test(void) __attribute__((transaction_safe));
+extern int something(void);
 extern void *malloc (__SIZE_TYPE__) __attribute__((malloc,transaction_safe));
 
 struct large { int foo[500]; };
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-3.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-3.c
index 1220ffc..d44bd7f 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-3.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-3.c
@@ -2,6 +2,7 @@
 /* { dg-options "-fgnu-tm -O -fdump-tree-tmmark" } */
 
 struct large { int x[100]; };
+extern int readint (void);
 extern int test(void) __attribute__((transaction_safe));
 
 int f()
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-4.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-4.c
index 58f8fd0..67135f3 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-4.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-4.c
@@ -6,6 +6,7 @@
 struct large { int x[100]; };
 struct large bark();
 extern int test (void) __attribute__((transaction_safe));
+extern int readint (void);
 
 int f()
 {
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-5.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-5.c
index 53f7f12..414de81 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-5.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-5.c
@@ -6,6 +6,7 @@
 struct large { int x[100]; };
 struct large bark();
 extern int test (void) __attribute__((transaction_safe));
+extern int readint (void);
 
 int f()
 {
diff --git gcc/gcc/testsuite/gcc.dg/tm/memopt-6.c 
gcc/gcc/testsuite/gcc.dg/tm/memopt-6.c
index 810a559..91524f9 100644
--- gcc/gcc/testsuite/gcc.dg/tm/memopt-6.c
+++ gcc/gcc/testsuite/gcc.dg/tm/memopt-6.c
@@ -4,6 +4,7 @@
 struct large { int x[100]; };
 struct large bark();
 extern int test (void) __attribute__((transaction_safe));
+extern int readint (void);
 struct large lacopy;
 
 int f()
diff --git gcc/gcc/testsuite/gcc.dg/tm/pr52173-1.c 
gcc/gcc/testsuite/gcc.dg/tm/pr52173-1.c
index 9ffa4d6..2bda9f5 100644
--- gcc/gcc/testsuite/gcc.dg/tm/pr52173-1.c
+++ gcc/gcc/testsuite/gcc.dg/tm/pr52173-1.c
@@ -11,6 +11,7 @@ void func()
     }
 }
 
+int
 main()
 { 
   int i;
diff --git gcc/gcc/testsuite/gcc.dg/tm/props-1.c 
gcc/gcc/testsuite/gcc.dg/tm/props-1.c
index 8969024..344e6df 100644
--- gcc/gcc/testsuite/gcc.dg/tm/props-1.c
+++ gcc/gcc/testsuite/gcc.dg/tm/props-1.c
@@ -3,6 +3,7 @@
 
 int global;
 
+void
 foo(int local)
 {
   __transaction_atomic {
diff --git gcc/gcc/testsuite/gcc.dg/tm/props-2.c 
gcc/gcc/testsuite/gcc.dg/tm/props-2.c
index 56a3ffa..2d2bdb8 100644
--- gcc/gcc/testsuite/gcc.dg/tm/props-2.c
+++ gcc/gcc/testsuite/gcc.dg/tm/props-2.c
@@ -6,8 +6,9 @@
 int global;
 int george;
 
-extern crap() __attribute__((transaction_unsafe));
+extern void crap() __attribute__((transaction_unsafe));
 
+void
 foo(){
     __transaction_relaxed {
        global++;
diff --git gcc/gcc/testsuite/gcc.dg/tm/props-3.c 
gcc/gcc/testsuite/gcc.dg/tm/props-3.c
index 48f2230..606b9a3 100644
--- gcc/gcc/testsuite/gcc.dg/tm/props-3.c
+++ gcc/gcc/testsuite/gcc.dg/tm/props-3.c
@@ -5,6 +5,7 @@
 
 void (*indirect)(void);
 
+void
 foo(){
     __transaction_relaxed {
       (*indirect)();
diff --git gcc/gcc/testsuite/gcc.dg/tm/wrap-4.c 
gcc/gcc/testsuite/gcc.dg/tm/wrap-4.c
index 9a4ec06..d3a6a48 100644
--- gcc/gcc/testsuite/gcc.dg/tm/wrap-4.c
+++ gcc/gcc/testsuite/gcc.dg/tm/wrap-4.c
@@ -1,6 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-fgnu-tm -fdump-tree-optimized -O2" } */
 
+void bark (void);
+void candycane (void);
 static void candy() { candycane(); }
 
 static void tootsie_roll () __attribute__((transaction_wrap (candy)));

        Marek

Reply via email to