diff options
| author | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2014-10-22 17:46:29 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-11-13 10:20:40 +0100 |
| commit | 44dba9b9cddaf92d520defc74d38f7d576c9426b (patch) | |
| tree | 28cbdb730283e5748821a21f31277690136508a1 | |
| parent | d1fbcd564ab192434686588b9ff0853e158afbfc (diff) | |
| download | gdb-44dba9b9cddaf92d520defc74d38f7d576c9426b.zip gdb-44dba9b9cddaf92d520defc74d38f7d576c9426b.tar.gz gdb-44dba9b9cddaf92d520defc74d38f7d576c9426b.tar.bz2 | |
'callfuncs' test case: Fixes in conditionally compiled code
The C source file for the 'callfuncs' test case did not compile with
-DNO_PROTOTYPES or -DPROTOTYPES. This patch fixes various syntax
errors under #ifdef NO_PROTOTYPES and a small typo under #ifdef
PROTOTYPES.
gdb/testsuite/ChangeLog:
* gdb.base/callfuncs.c (t_float_many_args): Fix syntax error in
code guarded by #ifdef NO_PROTOTYPES.
(t_double_many_args): Likewise.
(DEF_FUNC_MANY_ARGS_1): Likewise.
(DEF_FUNC_VALUES_1): Likewise.
(t_structs_ldc): Renamed from t_structs_fc in conditional code
guarded by #ifdef PROTOTYPES.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/callfuncs.c | 20 |
2 files changed, 16 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7daae89..4cb7918 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,15 @@ 2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com> + * gdb.base/callfuncs.c (t_float_many_args): Fix syntax error in + code guarded by #ifdef NO_PROTOTYPES. + (t_double_many_args): Likewise. + (DEF_FUNC_MANY_ARGS_1): Likewise. + (DEF_FUNC_VALUES_1): Likewise. + (t_structs_ldc): Renamed from t_structs_fc in conditional code + guarded by #ifdef PROTOTYPES. + +2014-11-13 Andreas Arnez <arnez@linux.vnet.ibm.com> + * gdb.mi/mi-console.c: Add eye-catcher. * gdb.mi/mi-console.exp (semihosted_string): Refer to eye-catcher instead of literal line number. diff --git a/gdb/testsuite/gdb.base/callfuncs.c b/gdb/testsuite/gdb.base/callfuncs.c index 24fd33c..0b930b3 100644 --- a/gdb/testsuite/gdb.base/callfuncs.c +++ b/gdb/testsuite/gdb.base/callfuncs.c @@ -216,7 +216,7 @@ char *t_structs_a (struct struct1 tstruct) #ifdef TEST_COMPLEX float _Complex t_structs_fc (struct struct1 tstruct) { return tstruct.fc;} double _Complex t_structs_dc (struct struct1 tstruct) { return tstruct.dc;} -long double _Complex t_structs_fc (struct struct1 tstruct) { return tstruct.ldc;} +long double _Complex t_structs_ldc (struct struct1 tstruct) { return tstruct.ldc;} #endif #else char t_structs_c (tstruct) struct struct1 tstruct; { return (tstruct.c); } @@ -371,9 +371,7 @@ float #ifdef NO_PROTOTYPES t_float_many_args (f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15) - float f1, float f2, float f3, float f4, float f5, float f6, float f7, - float f8, float f9, float f10, float f11, float f12, float f13, float f14, - float f15; + float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15; #else t_float_many_args (float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, @@ -417,9 +415,7 @@ double #ifdef NO_PROTOTYPES t_double_many_args (f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15) - double f1, double f2, double f3, double f4, double f5, double f6, - double f7, double f8, double f9, double f10, double f11, double f12, - double f13, double f14, double f15; + double f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15; #else t_double_many_args (double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, double f10, @@ -450,12 +446,8 @@ t_double_many_args (double f1, double f2, double f3, double f4, double f5, #define DEF_FUNC_MANY_ARGS_1(TYPE, NAME) \ t_##NAME##_complex_many_args (f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, \ f12, f13, f14, f15, f16) \ - TYPE _Complex f1, TYPE _Complex f2, TYPE _Complex f3, \ - TYPE _Complex f4, TYPE _Complex f5, TYPE _Complex f6, \ - TYPE _Complex f7, TYPE _Complex f8, TYPE _Complex f9, \ - TYPE _Complex f10, TYPE _Complex f11, TYPE _Complex f12, \ - TYPE _Complex f13, TYPE _Complex f14, TYPE _Complex f15, \ - TYPE _Complex f16; + TYPE _Complex f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, \ + f13, f14, f15, f16; #define DEF_FUNC_MANY_ARGS_2(TYPE, NAME) \ t_##NAME##_complex_many_args (TYPE _Complex f1, TYPE _Complex f2, \ @@ -504,7 +496,7 @@ DEF_FUNC_MANY_ARGS_2(long double, long_double) DEF_FUNC_MANY_ARGS_3(long double, creall, cimagl) #define DEF_FUNC_VALUES_1(TYPE, NAME) \ - t_##NAME##_complex_values (f1, f2) TYPE _Complex f1, TYPE _Complex f2; + t_##NAME##_complex_values (f1, f2) TYPE _Complex f1, f2; #define DEF_FUNC_VALUES_2(TYPE, NAME) \ t_##NAME##_complex_values (TYPE _Complex f1, TYPE _Complex f2) |