From patchwork Tue Nov 4 15:40:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 3571 Received: (qmail 11224 invoked by alias); 4 Nov 2014 15:41:15 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 11213 invoked by uid 89); 4 Nov 2014 15:41:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp11.uk.ibm.com Received: from e06smtp11.uk.ibm.com (HELO e06smtp11.uk.ibm.com) (195.75.94.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 04 Nov 2014 15:41:13 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 4 Nov 2014 15:41:10 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 4 Nov 2014 15:41:09 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5E9832190066 for ; Tue, 4 Nov 2014 15:40:43 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sA4Ff8k52163198 for ; Tue, 4 Nov 2014 15:41:08 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sA4Ff7mI012623 for ; Tue, 4 Nov 2014 08:41:08 -0700 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sA4FetuL012032; Tue, 4 Nov 2014 08:41:07 -0700 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Mark Kettenis , dje@google.com, sandra@codesourcery.com Subject: [PATCH 1/3] 'callfuncs' test case: Fixes in conditionally compiled code Date: Tue, 4 Nov 2014 16:40:43 +0100 Message-Id: <1415115655-4077-2-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1415115655-4077-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1415115655-4077-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14110415-0005-0000-0000-000001F01CC9 X-IsSubscribed: yes 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. --- gdb/testsuite/gdb.base/callfuncs.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) 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)