Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1293547 > unrolled thread
| Started by | Wang Nan <wangnan0@huawei.com> |
|---|---|
| First post | 2015-12-17 02:50 +0100 |
| Last post | 2015-12-17 07:10 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan <wangnan0@huawei.com> - 2015-12-17 02:50 +0100
Re: [RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-17 06:20 +0100
Re: [RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts "Wangnan (F)" <wangnan0@huawei.com> - 2015-12-17 07:10 +0100
| From | Wang Nan <wangnan0@huawei.com> |
|---|---|
| Date | 2015-12-17 02:50 +0100 |
| Subject | [RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts |
| Message-ID | <qGvRD-19w-1@gated-at.bofh.it> |
After this patch other directories can use this architecture detector
without directly including it from perf's directory. Libbpf would
utilize it to get proper $(ARCH) so it can receive correct uapi include
directory.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
tools/perf/config/Makefile | 2 +-
tools/perf/config/Makefile.arch | 18 ------------------
tools/perf/tests/make | 2 +-
tools/scripts/Makefile.arch | 18 ++++++++++++++++++
4 files changed, 20 insertions(+), 20 deletions(-)
delete mode 100644 tools/perf/config/Makefile.arch
create mode 100644 tools/scripts/Makefile.arch
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index a552417..34717e4 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -17,7 +17,7 @@ detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected)
CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)
-include $(src-perf)/config/Makefile.arch
+include $(srctree)/tools/scripts/Makefile.arch
$(call detected_var,ARCH)
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
deleted file mode 100644
index e11fbd6..0000000
--- a/tools/perf/config/Makefile.arch
+++ /dev/null
@@ -1,18 +0,0 @@
-ifndef ARCH
-ARCH := $(shell uname -m 2>/dev/null || echo not)
-endif
-
-ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
- -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
- -e /arm64/!s/arm.*/arm/ -e s/sa110/arm/ \
- -e s/s390x/s390/ -e s/parisc64/parisc/ \
- -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
- -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
- -e s/tile.*/tile/ )
-
-LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
-ifeq ($(LP64), 1)
- IS_64_BIT := 1
-else
- IS_64_BIT := 0
-endif
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index c1fbb8e..a8ede37 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -12,7 +12,7 @@ endif
else
PERF := .
-include config/Makefile.arch
+include $(srctree)/scripts/Makefile.arch
# FIXME looks like x86 is the only arch running tests ;-)
# we need some IS_(32/64) flag to make this generic
diff --git a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch
new file mode 100644
index 0000000..e11fbd6
--- /dev/null
+++ b/tools/scripts/Makefile.arch
@@ -0,0 +1,18 @@
+ifndef ARCH
+ARCH := $(shell uname -m 2>/dev/null || echo not)
+endif
+
+ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
+ -e /arm64/!s/arm.*/arm/ -e s/sa110/arm/ \
+ -e s/s390x/s390/ -e s/parisc64/parisc/ \
+ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+ -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
+ -e s/tile.*/tile/ )
+
+LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
+ifeq ($(LP64), 1)
+ IS_64_BIT := 1
+else
+ IS_64_BIT := 0
+endif
--
1.8.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> |
|---|---|
| Date | 2015-12-17 06:20 +0100 |
| Subject | Re: [RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts |
| Message-ID | <qGz8R-3nW-7@gated-at.bofh.it> |
| In reply to | #1293547 |
On 2015/12/17 01:43AM, Wang Nan wrote: > After this patch other directories can use this architecture detector > without directly including it from perf's directory. Libbpf would > utilize it to get proper $(ARCH) so it can receive correct uapi include > directory. > > Signed-off-by: Wang Nan <wangnan0@huawei.com> > Acked-by: Jiri Olsa <jolsa@kernel.org> > Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > --- > tools/perf/config/Makefile | 2 +- > tools/perf/config/Makefile.arch | 18 ------------------ > tools/perf/tests/make | 2 +- > tools/scripts/Makefile.arch | 18 ++++++++++++++++++ > 4 files changed, 20 insertions(+), 20 deletions(-) > delete mode 100644 tools/perf/config/Makefile.arch > create mode 100644 tools/scripts/Makefile.arch ^^^^^^ This is different from your previous version. This should be a file rename. - Naveen -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Wangnan (F)" <wangnan0@huawei.com> |
|---|---|
| Date | 2015-12-17 07:10 +0100 |
| Subject | Re: [RESEND PATCH v4 2/3] tools: Move Makefile.arch from perf/config to tools/scripts |
| Message-ID | <qGzVf-3W7-1@gated-at.bofh.it> |
| In reply to | #1293616 |
On 2015/12/17 13:10, Naveen N. Rao wrote: > On 2015/12/17 01:43AM, Wang Nan wrote: >> After this patch other directories can use this architecture detector >> without directly including it from perf's directory. Libbpf would >> utilize it to get proper $(ARCH) so it can receive correct uapi include >> directory. >> >> Signed-off-by: Wang Nan <wangnan0@huawei.com> >> Acked-by: Jiri Olsa <jolsa@kernel.org> >> Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> >> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> >> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> >> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> >> --- >> tools/perf/config/Makefile | 2 +- >> tools/perf/config/Makefile.arch | 18 ------------------ >> tools/perf/tests/make | 2 +- >> tools/scripts/Makefile.arch | 18 ++++++++++++++++++ >> 4 files changed, 20 insertions(+), 20 deletions(-) >> delete mode 100644 tools/perf/config/Makefile.arch >> create mode 100644 tools/scripts/Makefile.arch > ^^^^^^ > This is different from your previous version. This should be a file > rename. Forget to use git format -M. The content is identical. Should I send it again? Thank you. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web