75e0b5f010
When building perf for arm64 I hit a warning (and be treated as an
error) like below:
aarch64-oe-linux-gcc -o .../scripts/perl/Perf-Trace-Util/Context.o -c -Wbad-function-cast \
... scripts/perl/Perf-Trace-Util/Context.c
In file included from .../usr/lib64/perl/5.14.3/CORE/perl.h:2464:0,
from Context.xs:23:
/.../usr/lib64/perl/5.14.3/CORE/handy.h:108:0: error: "bool" redefined [-Werror]
# define bool char
^
In file included from /.../usr/src/kernel/tools/include/linux/types.h:4:0,
from /.../usr/src/kernel/arch/arm64/include/uapi/asm/sigcontext.h:19,
from /.../usr/include/bits/sigcontext.h:27,
from /.../usr/include/signal.h:340,
from /.../usr/include/sys/param.h:28,
from /.../usr/lib64/perl/5.14.3/CORE/perl.h:678,
from Context.xs:23:
/.../usr/lib/aarch64-oe-linux/gcc/aarch64-oe-linux/4.9.2/include/stdbool.h:33:0: note: this is the location of the previous definition
#define bool _Bool
Looks like the failure is caused by arm64 uapi/asm/sigcontext.h, which
includes linux/types.h while other archs not.
Current perl consider this problem:
http://perl5.git.perl.org/perl.git/commit/bd31be4baa3ee68abdb92c0db3200efe0fad903b
However there are users which use old version of perl.
This patch includes stdbool.h before Context.xs and define HAS_BOOL to
prevent perl'e headers define its own 'bool'. Code is learn from perl's
git tree.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Link: http://lkml.kernel.org/r/1421671397-4659-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
138 lines
3.7 KiB
C
138 lines
3.7 KiB
C
/*
|
|
* This file was generated automatically by ExtUtils::ParseXS version 2.18_02 from the
|
|
* contents of Context.xs. Do not edit this file, edit Context.xs instead.
|
|
*
|
|
* ANY CHANGES MADE HERE WILL BE LOST!
|
|
*
|
|
*/
|
|
#include <stdbool.h>
|
|
#ifndef HAS_BOOL
|
|
# define HAS_BOOL 1
|
|
#endif
|
|
#line 1 "Context.xs"
|
|
/*
|
|
* Context.xs. XS interfaces for perf script.
|
|
*
|
|
* Copyright (C) 2009 Tom Zanussi <tzanussi@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include "EXTERN.h"
|
|
#include "perl.h"
|
|
#include "XSUB.h"
|
|
#include "../../../perf.h"
|
|
#include "../../../util/trace-event.h"
|
|
|
|
#ifndef PERL_UNUSED_VAR
|
|
# define PERL_UNUSED_VAR(var) if (0) var = var
|
|
#endif
|
|
|
|
#line 42 "Context.c"
|
|
|
|
XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */
|
|
XS(XS_Perf__Trace__Context_common_pc)
|
|
{
|
|
#ifdef dVAR
|
|
dVAR; dXSARGS;
|
|
#else
|
|
dXSARGS;
|
|
#endif
|
|
if (items != 1)
|
|
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_pc", "context");
|
|
PERL_UNUSED_VAR(cv); /* -W */
|
|
{
|
|
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
|
|
int RETVAL;
|
|
dXSTARG;
|
|
|
|
RETVAL = common_pc(context);
|
|
XSprePUSH; PUSHi((IV)RETVAL);
|
|
}
|
|
XSRETURN(1);
|
|
}
|
|
|
|
|
|
XS(XS_Perf__Trace__Context_common_flags); /* prototype to pass -Wmissing-prototypes */
|
|
XS(XS_Perf__Trace__Context_common_flags)
|
|
{
|
|
#ifdef dVAR
|
|
dVAR; dXSARGS;
|
|
#else
|
|
dXSARGS;
|
|
#endif
|
|
if (items != 1)
|
|
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_flags", "context");
|
|
PERL_UNUSED_VAR(cv); /* -W */
|
|
{
|
|
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
|
|
int RETVAL;
|
|
dXSTARG;
|
|
|
|
RETVAL = common_flags(context);
|
|
XSprePUSH; PUSHi((IV)RETVAL);
|
|
}
|
|
XSRETURN(1);
|
|
}
|
|
|
|
|
|
XS(XS_Perf__Trace__Context_common_lock_depth); /* prototype to pass -Wmissing-prototypes */
|
|
XS(XS_Perf__Trace__Context_common_lock_depth)
|
|
{
|
|
#ifdef dVAR
|
|
dVAR; dXSARGS;
|
|
#else
|
|
dXSARGS;
|
|
#endif
|
|
if (items != 1)
|
|
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_lock_depth", "context");
|
|
PERL_UNUSED_VAR(cv); /* -W */
|
|
{
|
|
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
|
|
int RETVAL;
|
|
dXSTARG;
|
|
|
|
RETVAL = common_lock_depth(context);
|
|
XSprePUSH; PUSHi((IV)RETVAL);
|
|
}
|
|
XSRETURN(1);
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
XS(boot_Perf__Trace__Context); /* prototype to pass -Wmissing-prototypes */
|
|
XS(boot_Perf__Trace__Context)
|
|
{
|
|
#ifdef dVAR
|
|
dVAR; dXSARGS;
|
|
#else
|
|
dXSARGS;
|
|
#endif
|
|
const char* file = __FILE__;
|
|
|
|
PERL_UNUSED_VAR(cv); /* -W */
|
|
PERL_UNUSED_VAR(items); /* -W */
|
|
XS_VERSION_BOOTCHECK ;
|
|
|
|
newXSproto("Perf::Trace::Context::common_pc", XS_Perf__Trace__Context_common_pc, file, "$");
|
|
newXSproto("Perf::Trace::Context::common_flags", XS_Perf__Trace__Context_common_flags, file, "$");
|
|
newXSproto("Perf::Trace::Context::common_lock_depth", XS_Perf__Trace__Context_common_lock_depth, file, "$");
|
|
if (PL_unitcheckav)
|
|
call_list(PL_scopestack_ix, PL_unitcheckav);
|
|
XSRETURN_YES;
|
|
}
|
|
|