linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 01/13] perf: Use -iquote for local include paths
Date: Fri,  4 Dec 2015 15:59:12 -0600	[thread overview]
Message-ID: <9559878c44a9385fc198ca0aa1f16ecdec7c25b9.1449265570.git.jpoimboe@redhat.com> (raw)
In-Reply-To: <cover.1449265570.git.jpoimboe@redhat.com>

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


  reply	other threads:[~2015-12-04 21:59 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 21:59 [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools Josh Poimboeuf
2015-12-04 21:59 ` Josh Poimboeuf [this message]
2015-12-04 21:59 ` [PATCH 02/13] perf: Split up util.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 03/13] perf: Move term functions out of util.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 04/13] perf: Remove unused pager_use_color variable Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 05/13] perf: Split up cache.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 06/13] perf: Remove cache.h Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 07/13] perf: Save cmdline arguments earlier Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 08/13] perf: Remove check for unused PERF_PAGER_IN_USE Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 09/13] perf: Move cmd_version() to builtin-version.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 10/13] perf: Move help_unknown_cmd() to its own file Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 11/13] perf tools: Move strlcpy() to tools/lib/string.c Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 12/13] perf tools: Move perf subcommand framework into a library Josh Poimboeuf
2015-12-04 22:21   ` [PATCH 12/13 v1.1] perf tools: Move tools/lib/string.c to libapi Josh Poimboeuf
2015-12-04 21:59 ` [PATCH 13/13] perf tools: Move subcommand framework and related utils " Josh Poimboeuf
2015-12-06  9:37 ` [PATCH 00/13] perf tools: Move perf subcommand framework into lib/tools Ingo Molnar
2015-12-06 15:50   ` Jiri Olsa
2015-12-06 20:02     ` Josh Poimboeuf
2015-12-07  8:46       ` Jiri Olsa
2015-12-08 14:52         ` Arnaldo Carvalho de Melo
2015-12-08 14:55           ` Arnaldo Carvalho de Melo
2015-12-08 15:27             ` Josh Poimboeuf
2015-12-08 15:29             ` Arnaldo Carvalho de Melo
2015-12-08 15:41               ` Arnaldo Carvalho de Melo
2015-12-06 18:28   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9559878c44a9385fc198ca0aa1f16ecdec7c25b9.1449265570.git.jpoimboe@redhat.com \
    --to=jpoimboe@redhat.com \
    --cc=acme@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).