From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754298Ab3GDNpi (ORCPT ); Thu, 4 Jul 2013 09:45:38 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:42273 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756635Ab3GDNop (ORCPT ); Thu, 4 Jul 2013 09:44:45 -0400 From: Ramkumar Ramachandra To: LKML Cc: Arnaldo Carvalho de Melo , Namhyung Kim Subject: [PATCH 2/2] perf: squelch warnings from perl.h to compile-pass Date: Thu, 4 Jul 2013 19:10:46 +0530 Message-Id: <1372945246-21605-3-git-send-email-artagnon@gmail.com> X-Mailer: git-send-email 1.8.3.1.643.gebeea52.dirty In-Reply-To: <1372945246-21605-1-git-send-email-artagnon@gmail.com> References: <1372945246-21605-1-git-send-email-artagnon@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, a simple $ make errors out because we compile with -Werror by default, turning all warnings into errors. Although no warnings are emitted by our code itself, two kinds of warnings are emitted by perl.h (perl 5.18.0): -Wundef and -Wswitch-default Use #pragma statements to squelch exactly those warnings, and get perf to compile-pass by default. Cc: Arnaldo Carvalho de Melo Cc: Namhyung Kim Signed-off-by: Ramkumar Ramachandra --- tools/perf/config/feature-tests.mak | 5 +++++ tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 10 ++++++++-- tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 10 ++++++++-- tools/perf/util/scripting-engines/trace-event-perl.c | 5 +++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak index 708fb8e..91fa083 100644 --- a/tools/perf/config/feature-tests.mak +++ b/tools/perf/config/feature-tests.mak @@ -103,7 +103,12 @@ endif ifndef NO_LIBPERL define SOURCE_PERL_EMBED #include + +#pragma GCC diagnostic ignored \"-Wundef\" +#pragma GCC diagnostic ignored \"-Wswitch-default\" #include +#pragma GCC diagnostic error \"-Wundef\" +#pragma GCC diagnostic error \"-Wswitch-default\" int main(void) { diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c index 790ceba..0807294 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c @@ -28,8 +28,14 @@ * */ -#include "EXTERN.h" -#include "perl.h" +#include + +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wswitch-default" +#include +#pragma GCC diagnostic error "-Wundef" +#pragma GCC diagnostic error "-Wswitch-default" + #include "XSUB.h" #include "../../../perf.h" #include "../../../util/trace-event.h" diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs index c1e2ed1..cd46e01 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs @@ -19,8 +19,14 @@ * */ -#include "EXTERN.h" -#include "perl.h" +#include + +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wswitch-default" +#include +#pragma GCC diagnostic error "-Wundef" +#pragma GCC diagnostic error "-Wswitch-default" + #include "XSUB.h" #include "../../../perf.h" #include "../../../util/script-event.h" diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index eacec85..aa3c11e 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -27,7 +27,12 @@ #include "../util.h" #include + +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wswitch-default" #include +#pragma GCC diagnostic error "-Wundef" +#pragma GCC diagnostic error "-Wswitch-default" #include "../../perf.h" #include "../thread.h" -- 1.8.3.1.643.gebeea52.dirty