* [PATCH 0/3] x86/build: clean-up of vdso Makefile
@ 2018-05-15 2:52 Masahiro Yamada
2018-05-15 2:52 ` [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile Masahiro Yamada
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-15 2:52 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, x86
Cc: Masahiro Yamada, H. Peter Anvin, user-mode-linux-user,
user-mode-linux-devel, linux-kernel, Richard Weinberger,
Andy Lutomirski, Jeff Dike
Masahiro Yamada (3):
x86/build: vdso: remove unused $(vobjs-nox32) in Makefile
x86/build: vdso: remove unnecessary export in Makefile
x86/build: vdso: put generated linker scripts to $(obj)/
arch/x86/entry/vdso/Makefile | 11 ++++-------
arch/x86/um/vdso/Makefile | 4 ++--
2 files changed, 6 insertions(+), 9 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile
2018-05-15 2:52 [PATCH 0/3] x86/build: clean-up of vdso Makefile Masahiro Yamada
@ 2018-05-15 2:52 ` Masahiro Yamada
2018-05-15 5:39 ` [tip:x86/build] x86/build/vdso: Remove " tip-bot for Masahiro Yamada
2018-05-15 2:52 ` [PATCH 2/3] x86/build: vdso: remove unnecessary export " Masahiro Yamada
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-15 2:52 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, x86
Cc: Masahiro Yamada, H. Peter Anvin, linux-kernel, Andy Lutomirski
Since commit bfad381c0d1e ("x86/vdso: Improve the fake section
headers"), $(vobjs-nox32) is empty. Therefore, $(vobjs64-for-x32)
is the same as $(vobjs-y).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/x86/entry/vdso/Makefile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index d998a48..2988506 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -100,11 +100,8 @@ VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
-Wl,-z,max-page-size=4096 \
-Wl,-z,common-page-size=4096
-# 64-bit objects to re-brand as x32
-vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))
-
# x32-rebranded versions
-vobjx32s-y := $(vobjs64-for-x32:.o=-x32.o)
+vobjx32s-y := $(vobjs-y:.o=-x32.o)
# same thing, but in the output directory
vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F)
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] x86/build: vdso: remove unnecessary export in Makefile
2018-05-15 2:52 [PATCH 0/3] x86/build: clean-up of vdso Makefile Masahiro Yamada
2018-05-15 2:52 ` [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile Masahiro Yamada
@ 2018-05-15 2:52 ` Masahiro Yamada
2018-05-15 5:40 ` [tip:x86/build] x86/build/vdso: Remove " tip-bot for Masahiro Yamada
2018-05-15 2:52 ` [PATCH 3/3] x86/build: vdso: put generated linker scripts to $(obj)/ Masahiro Yamada
2018-05-22 20:34 ` [PATCH 0/3] x86/build: clean-up of vdso Makefile Andy Lutomirski
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-15 2:52 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, x86
Cc: Masahiro Yamada, H. Peter Anvin, user-mode-linux-user,
user-mode-linux-devel, linux-kernel, Richard Weinberger,
Andy Lutomirski, Jeff Dike
CPPFLAGS_vdso.lds is assigned and referenced internally in each
Makefile. No need to export it.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/x86/entry/vdso/Makefile | 2 +-
arch/x86/um/vdso/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 2988506..690df4c 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -44,7 +44,7 @@ obj-y += $(vdso_img_objs)
targets += $(vdso_img_cfiles)
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,--no-undefined \
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 426681e..3af55cd 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -23,7 +23,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] x86/build: vdso: put generated linker scripts to $(obj)/
2018-05-15 2:52 [PATCH 0/3] x86/build: clean-up of vdso Makefile Masahiro Yamada
2018-05-15 2:52 ` [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile Masahiro Yamada
2018-05-15 2:52 ` [PATCH 2/3] x86/build: vdso: remove unnecessary export " Masahiro Yamada
@ 2018-05-15 2:52 ` Masahiro Yamada
2018-05-15 5:40 ` [tip:x86/build] x86/build/vdso: Put " tip-bot for Masahiro Yamada
2018-05-22 20:34 ` [PATCH 0/3] x86/build: clean-up of vdso Makefile Andy Lutomirski
3 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-15 2:52 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, x86
Cc: Masahiro Yamada, H. Peter Anvin, user-mode-linux-user,
user-mode-linux-devel, linux-kernel, Richard Weinberger,
Andy Lutomirski, Jeff Dike
Let's put generated files to $(obj)/ rather than $(src)/ although
this is just a matter of taste because both are the same.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/x86/entry/vdso/Makefile | 4 ++--
arch/x86/um/vdso/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 690df4c..261802b 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
$(DISABLE_LTO)
-$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
$(obj)/%.so: $(obj)/%.so.dbg
$(call if_changed,objcopy)
-$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
+$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
$(call if_changed,vdso)
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 3af55cd..822ccdb 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
$(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
$(obj)/%.so: OBJCOPYFLAGS := -S
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [tip:x86/build] x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile
2018-05-15 2:52 ` [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile Masahiro Yamada
@ 2018-05-15 5:39 ` tip-bot for Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Masahiro Yamada @ 2018-05-15 5:39 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, luto, yamada.masahiro, peterz, linux-kernel, torvalds, tglx, mingo
Commit-ID: b3656612118f8961182f988168c835f023f0408a
Gitweb: https://git.kernel.org/tip/b3656612118f8961182f988168c835f023f0408a
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 15 May 2018 11:52:22 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 15 May 2018 07:32:42 +0200
x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile
Since commit bfad381c0d1e ("x86/vdso: Improve the fake section
headers"), $(vobjs-nox32) is empty. Therefore, $(vobjs64-for-x32)
is the same as $(vobjs-y).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1526352744-28229-2-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/vdso/Makefile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index d998a487c9b1..298850683ee2 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -100,11 +100,8 @@ VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
-Wl,-z,max-page-size=4096 \
-Wl,-z,common-page-size=4096
-# 64-bit objects to re-brand as x32
-vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))
-
# x32-rebranded versions
-vobjx32s-y := $(vobjs64-for-x32:.o=-x32.o)
+vobjx32s-y := $(vobjs-y:.o=-x32.o)
# same thing, but in the output directory
vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [tip:x86/build] x86/build/vdso: Remove unnecessary export in Makefile
2018-05-15 2:52 ` [PATCH 2/3] x86/build: vdso: remove unnecessary export " Masahiro Yamada
@ 2018-05-15 5:40 ` tip-bot for Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Masahiro Yamada @ 2018-05-15 5:40 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, mingo, richard, torvalds, yamada.masahiro, jdike,
hpa, tglx, peterz, luto
Commit-ID: 61615faf0a8968b604bd279fec5cb834ba59ed58
Gitweb: https://git.kernel.org/tip/61615faf0a8968b604bd279fec5cb834ba59ed58
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 15 May 2018 11:52:23 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 15 May 2018 07:32:42 +0200
x86/build/vdso: Remove unnecessary export in Makefile
CPPFLAGS_vdso.lds is assigned and referenced internally in each
Makefile. No need to export it.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Link: http://lkml.kernel.org/r/1526352744-28229-3-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/vdso/Makefile | 2 +-
arch/x86/um/vdso/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 298850683ee2..690df4c6b40a 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -44,7 +44,7 @@ obj-y += $(vdso_img_objs)
targets += $(vdso_img_cfiles)
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,--no-undefined \
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 10003359e633..e51d95c9098c 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -23,7 +23,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [tip:x86/build] x86/build/vdso: Put generated linker scripts to $(obj)/
2018-05-15 2:52 ` [PATCH 3/3] x86/build: vdso: put generated linker scripts to $(obj)/ Masahiro Yamada
@ 2018-05-15 5:40 ` tip-bot for Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Masahiro Yamada @ 2018-05-15 5:40 UTC (permalink / raw)
To: linux-tip-commits
Cc: jdike, linux-kernel, luto, tglx, richard, torvalds,
yamada.masahiro, mingo, peterz, hpa
Commit-ID: 1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Gitweb: https://git.kernel.org/tip/1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 15 May 2018 11:52:24 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 15 May 2018 07:32:42 +0200
x86/build/vdso: Put generated linker scripts to $(obj)/
Let's put generated files to $(obj)/ rather than $(src)/ although
this is just a matter of taste because both are the same.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Link: http://lkml.kernel.org/r/1526352744-28229-4-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/vdso/Makefile | 4 ++--
arch/x86/um/vdso/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 690df4c6b40a..261802b1cc50 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
$(DISABLE_LTO)
-$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
$(obj)/%.so: $(obj)/%.so.dbg
$(call if_changed,objcopy)
-$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
+$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
$(call if_changed,vdso)
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index e51d95c9098c..b2d6967262b2 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
$(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
$(obj)/%.so: OBJCOPYFLAGS := -S
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] x86/build: clean-up of vdso Makefile
2018-05-15 2:52 [PATCH 0/3] x86/build: clean-up of vdso Makefile Masahiro Yamada
` (2 preceding siblings ...)
2018-05-15 2:52 ` [PATCH 3/3] x86/build: vdso: put generated linker scripts to $(obj)/ Masahiro Yamada
@ 2018-05-22 20:34 ` Andy Lutomirski
3 siblings, 0 replies; 8+ messages in thread
From: Andy Lutomirski @ 2018-05-22 20:34 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Ingo Molnar, Thomas Gleixner, X86 ML, H. Peter Anvin,
open list:USER-MODE LINUX (UML),
user-mode-linux-devel, LKML, Richard Weinberger, Jeff Dike
On Mon, May 14, 2018 at 7:52 PM Masahiro Yamada <
yamada.masahiro@socionext.com> wrote:
> Masahiro Yamada (3):
> x86/build: vdso: remove unused $(vobjs-nox32) in Makefile
> x86/build: vdso: remove unnecessary export in Makefile
> x86/build: vdso: put generated linker scripts to $(obj)/
LGTM.
Acked-by: Andy Lutomirski <luto@kernel.org>
> arch/x86/entry/vdso/Makefile | 11 ++++-------
> arch/x86/um/vdso/Makefile | 4 ++--
> 2 files changed, 6 insertions(+), 9 deletions(-)
> --
> 2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-05-22 20:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-15 2:52 [PATCH 0/3] x86/build: clean-up of vdso Makefile Masahiro Yamada
2018-05-15 2:52 ` [PATCH 1/3] x86/build: vdso: remove unused $(vobjs-nox32) in Makefile Masahiro Yamada
2018-05-15 5:39 ` [tip:x86/build] x86/build/vdso: Remove " tip-bot for Masahiro Yamada
2018-05-15 2:52 ` [PATCH 2/3] x86/build: vdso: remove unnecessary export " Masahiro Yamada
2018-05-15 5:40 ` [tip:x86/build] x86/build/vdso: Remove " tip-bot for Masahiro Yamada
2018-05-15 2:52 ` [PATCH 3/3] x86/build: vdso: put generated linker scripts to $(obj)/ Masahiro Yamada
2018-05-15 5:40 ` [tip:x86/build] x86/build/vdso: Put " tip-bot for Masahiro Yamada
2018-05-22 20:34 ` [PATCH 0/3] x86/build: clean-up of vdso Makefile Andy Lutomirski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.