lkml.org 
[lkml]   [2015]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/13] perf: Use -iquote for local include paths
    Date
    If there's a local header file which has the same name as a system
    header file, '#include <header.h>' will mistakenly include the local
    file instead of the system file.

    With the next patch we'll have a string.h file. Use the '-iquote'
    option to prepare for it so that '#include "string.h"' picks up the
    local version.

    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
    ---
    tools/perf/config/Makefile | 4 ++--
    tools/perf/tests/Build | 6 +++---
    tools/perf/tests/bpf.c | 4 ++--
    tools/perf/tests/llvm.c | 4 ++--
    tools/perf/util/thread.h | 4 ++--
    5 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 6eb9a95..4f96ca3 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -210,8 +210,8 @@ CFLAGS += -I$(obj-perf)/util
    CFLAGS += -I$(obj-perf)
    endif

    -CFLAGS += -I$(src-perf)/util
    -CFLAGS += -I$(src-perf)
    +CFLAGS += -iquote $(src-perf)/util
    +CFLAGS += -iquote $(src-perf)
    CFLAGS += -I$(srctree)/tools/lib/

    CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
    diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
    index 0ff8a97..f8888e8 100644
    --- a/tools/perf/tests/Build
    +++ b/tools/perf/tests/Build
    @@ -37,21 +37,21 @@ perf-y += topology.o

    $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c
    $(call rule_mkdir)
    - $(Q)echo '#include <tests/llvm.h>' > $@
    + $(Q)echo '#include "tests/llvm.h"' > $@
    $(Q)echo 'const char test_llvm__bpf_base_prog[] =' >> $@
    $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
    $(Q)echo ';' >> $@

    $(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c
    $(call rule_mkdir)
    - $(Q)echo '#include <tests/llvm.h>' > $@
    + $(Q)echo '#include "tests/llvm.h"' > $@
    $(Q)echo 'const char test_llvm__bpf_test_kbuild_prog[] =' >> $@
    $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
    $(Q)echo ';' >> $@

    $(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c
    $(call rule_mkdir)
    - $(Q)echo '#include <tests/llvm.h>' > $@
    + $(Q)echo '#include "tests/llvm.h"' > $@
    $(Q)echo 'const char test_llvm__bpf_test_prologue_prog[] =' >> $@
    $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
    $(Q)echo ';' >> $@
    diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
    index 33689a0..044a119 100644
    --- a/tools/perf/tests/bpf.c
    +++ b/tools/perf/tests/bpf.c
    @@ -1,7 +1,7 @@
    #include <stdio.h>
    #include <sys/epoll.h>
    -#include <util/bpf-loader.h>
    -#include <util/evlist.h>
    +#include "util/bpf-loader.h"
    +#include "util/evlist.h"
    #include "tests.h"
    #include "llvm.h"
    #include "debug.h"
    diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c
    index 06f45c1..dc90cea 100644
    --- a/tools/perf/tests/llvm.c
    +++ b/tools/perf/tests/llvm.c
    @@ -1,7 +1,7 @@
    #include <stdio.h>
    #include <bpf/libbpf.h>
    -#include <util/llvm-utils.h>
    -#include <util/cache.h>
    +#include "util/llvm-utils.h"
    +#include "util/cache.h"
    #include "llvm.h"
    #include "tests.h"
    #include "debug.h"
    diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
    index a0ac031..f0d1035 100644
    --- a/tools/perf/util/thread.h
    +++ b/tools/perf/util/thread.h
    @@ -7,8 +7,8 @@
    #include <unistd.h>
    #include <sys/types.h>
    #include "symbol.h"
    -#include <strlist.h>
    -#include <intlist.h>
    +#include "strlist.h"
    +#include "intlist.h"

    struct thread_stack;

    --
    2.4.3


    \
     
     \ /
      Last update: 2015-12-04 23:21    [W:3.335 / U:0.704 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site