lkml.org 
[lkml]   [2014]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/8] tools include: Move perf's linux/compiler.h to a generic place
    Date
    So that it can be shared with others like libtraceevent.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/include/linux/compiler.h | 30 ++++++++++++++++++++++++++++++
    tools/perf/Makefile.perf | 2 +-
    tools/perf/config/Makefile | 1 +
    tools/perf/util/include/linux/compiler.h | 30 ------------------------------
    4 files changed, 32 insertions(+), 31 deletions(-)
    create mode 100644 tools/include/linux/compiler.h
    delete mode 100644 tools/perf/util/include/linux/compiler.h

    diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
    new file mode 100644
    index 000000000000..0135ccf2a00c
    --- /dev/null
    +++ b/tools/include/linux/compiler.h
    @@ -0,0 +1,30 @@
    +#ifndef _TOOLS_LINUX_COMPILER_H_
    +#define _TOOLS_LINUX_COMPILER_H_
    +
    +#ifndef __always_inline
    +# define __always_inline inline __attribute__((always_inline))
    +#endif
    +
    +#define __user
    +
    +#ifndef __attribute_const__
    +# define __attribute_const__
    +#endif
    +
    +#ifndef __maybe_unused
    +# define __maybe_unused __attribute__((unused))
    +#endif
    +
    +#ifndef __packed
    +# define __packed __attribute__((__packed__))
    +#endif
    +
    +#ifndef __force
    +# define __force
    +#endif
    +
    +#ifndef __weak
    +# define __weak __attribute__((weak))
    +#endif
    +
    +#endif /* _TOOLS_LINUX_COMPILER_H */
    diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
    index 3638b0bd20dc..6be06767da7b 100644
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -211,7 +211,7 @@ LIB_H += ../../include/linux/hash.h
    LIB_H += ../../include/linux/stringify.h
    LIB_H += util/include/linux/bitmap.h
    LIB_H += util/include/linux/bitops.h
    -LIB_H += util/include/linux/compiler.h
    +LIB_H += ../include/linux/compiler.h
    LIB_H += util/include/linux/const.h
    LIB_H += util/include/linux/ctype.h
    LIB_H += util/include/linux/kernel.h
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index f2bc659d20af..600d39781d11 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -224,6 +224,7 @@ endif

    CFLAGS += -I$(src-perf)/util/include
    CFLAGS += -I$(src-perf)/arch/$(ARCH)/include
    +CFLAGS += -I$(srctree)/tools/include/
    CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi
    CFLAGS += -I$(srctree)/arch/$(ARCH)/include
    CFLAGS += -I$(srctree)/include/uapi
    diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
    deleted file mode 100644
    index b003ad7200b2..000000000000
    --- a/tools/perf/util/include/linux/compiler.h
    +++ /dev/null
    @@ -1,30 +0,0 @@
    -#ifndef _PERF_LINUX_COMPILER_H_
    -#define _PERF_LINUX_COMPILER_H_
    -
    -#ifndef __always_inline
    -# define __always_inline inline __attribute__((always_inline))
    -#endif
    -
    -#define __user
    -
    -#ifndef __attribute_const__
    -# define __attribute_const__
    -#endif
    -
    -#ifndef __maybe_unused
    -# define __maybe_unused __attribute__((unused))
    -#endif
    -
    -#ifndef __packed
    -# define __packed __attribute__((__packed__))
    -#endif
    -
    -#ifndef __force
    -# define __force
    -#endif
    -
    -#ifndef __weak
    -# define __weak __attribute__((weak))
    -#endif
    -
    -#endif
    --
    1.7.9.2


    \
     
     \ /
      Last update: 2014-01-09 15:41    [W:3.296 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site