aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2016-01-08 20:07:02 +0100
committerJan Kratochvil <jan.kratochvil@redhat.com>2016-01-08 20:07:02 +0100
commit6cfc1fcb515d1ecd8445905b4749b81b3ca69552 (patch)
tree659151ca195a5205e79a2f3145e4b4faf336ba38
parent582a1b0064b14cb12b18f48678876d32c59c11c8 (diff)
downloadbinutils-6cfc1fcb515d1ecd8445905b4749b81b3ca69552.zip
binutils-6cfc1fcb515d1ecd8445905b4749b81b3ca69552.tar.gz
binutils-6cfc1fcb515d1ecd8445905b4749b81b3ca69552.tar.bz2
Fix gdb.multi/base.exp testsuite regression
Regressed by: commit 762f774785f4ef878ac4c831e1f4733dc957234d Author: Pedro Alves <palves@redhat.com> Date: Thu Dec 10 16:21:06 2015 +0000 Stop using nowarnings in gdb/testsuite/gdb.multi/ +gdb compile failed, gdb/testsuite/gdb.multi/hello.c: In function 'commonfun': +gdb/testsuite/gdb.multi/hello.c:24:19: warning: implicit declaration of function 'bar' [-Wimplicit-function-declaration] + int commonfun() { bar(); } /* from hello */ + ^ +gdb/testsuite/gdb.multi/hello.c: At top level: +gdb/testsuite/gdb.multi/hello.c:26:1: warning: return type defaults to 'int' [-Wimplicit-int] + bar() + ^ +gdb/testsuite/gdb.multi/hello.c:32:1: warning: return type defaults to 'int' [-Wimplicit-int] + hello(int x) + ^ +gdb/testsuite/gdb.multi/hello.c:38:1: warning: return type defaults to 'int' [-Wimplicit-int] + main() + ^ +UNTESTED: gdb.multi/base.exp: base.exp gdb/testsuite/ChangeLog 2016-01-08 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.multi/goodbye.c: Fix compilation warnings by adding return types and reordering the functions. * gdb.multi/hangout.c: Likewise. * gdb.multi/hello.c: Likewise.
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.multi/goodbye.c28
-rw-r--r--gdb/testsuite/gdb.multi/hangout.c1
-rw-r--r--gdb/testsuite/gdb.multi/hello.c7
4 files changed, 29 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6fd6e4f..ac72685 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-08 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.multi/goodbye.c: Fix compilation warnings by adding return types
+ and reordering the functions.
+ * gdb.multi/hangout.c: Likewise.
+ * gdb.multi/hello.c: Likewise.
+
2016-01-08 Simon Marchi <simon.marchi@ericsson.com>
* gdb.perf/lib/perftest/perftest.py: Change relative imports to
diff --git a/gdb/testsuite/gdb.multi/goodbye.c b/gdb/testsuite/gdb.multi/goodbye.c
index 701e504..bf7759a 100644
--- a/gdb/testsuite/gdb.multi/goodbye.c
+++ b/gdb/testsuite/gdb.multi/goodbye.c
@@ -39,24 +39,28 @@ int verylongfun()
glob *= 9;
}
-main() {
- mailand();
- foo(glob);
- verylongfun();
- goodbye();
-}
-
-foo(int x) {
- return x + 92;
-}
-
+void
mailand()
{
glob = 46;
}
-void commonfun() { mailand(); } /* from goodbye */
+int
+foo(int x) {
+ return x + 92;
+}
+void
goodbye() {
++glob;
}
+
+int
+main() {
+ mailand();
+ foo(glob);
+ verylongfun();
+ goodbye();
+}
+
+void commonfun() { mailand(); } /* from goodbye */
diff --git a/gdb/testsuite/gdb.multi/hangout.c b/gdb/testsuite/gdb.multi/hangout.c
index e2c41b8..3701512 100644
--- a/gdb/testsuite/gdb.multi/hangout.c
+++ b/gdb/testsuite/gdb.multi/hangout.c
@@ -17,6 +17,7 @@
#include <stdio.h>
+int
main(int argc, char *argv[])
{
int i;
diff --git a/gdb/testsuite/gdb.multi/hello.c b/gdb/testsuite/gdb.multi/hello.c
index efff59d..93d921f 100644
--- a/gdb/testsuite/gdb.multi/hello.c
+++ b/gdb/testsuite/gdb.multi/hello.c
@@ -21,20 +21,23 @@ short hglob = 1;
short glob = 92;
-int commonfun() { bar(); } /* from hello */
-
+void
bar()
{
if (glob == 0)
exit(1);
}
+int commonfun() { bar(); } /* from hello */
+
+int
hello(int x)
{
x *= 2;
return x + 45;
}
+int
main()
{
int tmpx;