lkml.org 
[lkml]   [2012]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 03/12] perf tools: include __WORDSIZE definition
    Date
    From: Irina Tirdea <irina.tirdea@intel.com>

    __WORDSIZE is GLibC-specific and is not defined on all systems or glibc
    versions (e.g. Android's bionic does not define it).

    In file included from util/include/linux/bitmap.h:5:0,
    from util/header.h:10,
    from util/session.h:6,
    from util/build-id.h:4,
    from util/annotate.c:11:
    util/include/linux/bitops.h: In function 'set_bit':
    util/include/linux/bitops.h:25:12: error:
    '__WORDSIZE' undeclared (first use in this function)
    util/include/linux/bitops.h:25:12: note:
    each undeclared identifier is reported only once for each function it appears in
    util/include/linux/bitops.h:23:51: error:
    parameter 'addr' set but not used [-Werror=unused-but-set-parameter]
    util/include/linux/bitops.h: In function 'clear_bit':
    util/include/linux/bitops.h:30:12: error:
    '__WORDSIZE' undeclared (first use in this function)
    util/include/linux/bitops.h:28:53: error:
    parameter 'addr' set but not used [-Werror=unused-but-set-parameter]
    In file included from util/header.h:10:0,
    from util/session.h:6,
    from util/build-id.h:4,
    from util/annotate.c:11:
    util/include/linux/bitmap.h: In function 'bitmap_zero':
    util/include/linux/bitmap.h:22:6: error:
    '__WORDSIZE' undeclared (first use in this function)

    Defining __WORDSIZE in perf's headers if it is not already defined.

    Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
    ---
    tools/perf/util/include/linux/bitops.h | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
    index 587a230..91779ec 100644
    --- a/tools/perf/util/include/linux/bitops.h
    +++ b/tools/perf/util/include/linux/bitops.h
    @@ -5,6 +5,15 @@
    #include <linux/compiler.h>
    #include <asm/hweight.h>

    +#ifndef __WORDSIZE
    +#if defined(__x86_64__)
    +# define __WORDSIZE 64
    +#endif
    +#if defined(__i386__) || defined(__arm__)
    +# define __WORDSIZE 32
    +#endif
    +#endif
    +
    #define BITS_PER_LONG __WORDSIZE
    #define BITS_PER_BYTE 8
    #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-09-08 03:42    [W:0.024 / U:0.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site