From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932884AbbLHE15 (ORCPT ); Mon, 7 Dec 2015 23:27:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40118 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932605AbbLHEXy (ORCPT ); Mon, 7 Dec 2015 23:23:54 -0500 From: Josh Poimboeuf To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim Subject: [PATCH v2 02/14] perf: Use -iquote for local include paths Date: Mon, 7 Dec 2015 22:21:40 -0600 Message-Id: <3b5e3020c0e2365d5ecb38a49ef5bcbdc3b9291c.1449548395.git.jpoimboe@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If there's a local header file which has the same name as a system header file, '#include ' 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. Note that after applying this patch, a 'make clean' is needed to clear out the old versions of tools/perf/tests/llvm-src-*.c. Signed-off-by: Josh Poimboeuf --- 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 ' > $@ + $(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 ' > $@ + $(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 ' > $@ + $(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 #include -#include -#include +#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 #include -#include -#include +#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 #include #include "symbol.h" -#include -#include +#include "strlist.h" +#include "intlist.h" struct thread_stack; -- 2.4.3