[PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Masahiro Yamada]

At first, I sent the first patch to UML ML,
but they did not pick it up.
Instead, I was able to get Acked-by from Richard,
one of the UML maintainers.

https://patchwork.kernel.org/patch/10399787/

I am resending it to x86 ML.



Masahiro Yamada (2):
  x86/build/vdso: remove unused vdso-syms.lds
  x86/build/vdso: simplify cmd_vdso2c

 arch/x86/entry/vdso/Makefile |  4 +---
 arch/x86/um/vdso/.gitignore  |  1 -
 arch/x86/um/vdso/Makefile    | 16 ----------------
 3 files changed, 1 insertion(+), 20 deletions(-)

-- 
2.7.4

[PATCH 1/2] x86/build/vdso: remove unused vdso-syms.lds

[Masahiro Yamada]

This file contains symbol values, and was originally linked into
vmlinux, but I have no idea what it was actually used for.

Since commit 827880ec260b ("x86/um: thin archives build fix"), it is
not even linked.  Now it is completely orphan, and no problem has
been reported.  It is a proof that this file was not needed in the
first place.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Ingo Molnar <mingo@kernel.org>
---

 arch/x86/um/vdso/.gitignore |  1 -
 arch/x86/um/vdso/Makefile   | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/arch/x86/um/vdso/.gitignore b/arch/x86/um/vdso/.gitignore
index 9cac6d0..f8b69d8 100644
--- a/arch/x86/um/vdso/.gitignore
+++ b/arch/x86/um/vdso/.gitignore
@@ -1,2 +1 @@
-vdso-syms.lds
 vdso.lds
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index b2d6967..822ccdb 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -53,22 +53,6 @@ $(vobjs): KBUILD_CFLAGS += $(CFL)
 CFLAGS_REMOVE_vdso-note.o = -pg -fprofile-arcs -ftest-coverage
 CFLAGS_REMOVE_um_vdso.o = -pg -fprofile-arcs -ftest-coverage
 
-targets += vdso-syms.lds
-extra-$(VDSO64-y)			+= vdso-syms.lds
-
-#
-# Match symbols in the DSO that look like VDSO*; produce a file of constants.
-#
-sed-vdsosym := -e 's/^00*/0/' \
-	-e 's/^\([0-9a-fA-F]*\) . \(VDSO[a-zA-Z0-9_]*\)$$/\2 = 0x\1;/p'
-quiet_cmd_vdsosym = VDSOSYM $@
-define cmd_vdsosym
-	$(NM) $< | LC_ALL=C sed -n $(sed-vdsosym) | LC_ALL=C sort > $@
-endef
-
-$(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
-	$(call if_changed,vdsosym)
-
 #
 # The DSO images are built using a special linker script.
 #
-- 
2.7.4

[PATCH 2/2] x86/build/vdso: simplify cmd_vdso2c

[Masahiro Yamada]

No reason to use 'define' directive here.  Just use the = operator.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/x86/entry/vdso/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 261802b..b9ed1aa 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -58,9 +58,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(src
 hostprogs-y			+= vdso2c
 
 quiet_cmd_vdso2c = VDSO2C  $@
-define cmd_vdso2c
-	$(obj)/vdso2c $< $(<:%.dbg=%) $@
-endef
+      cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
 
 $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
 	$(call if_changed,vdso2c)
-- 
2.7.4

Re: [PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Richard Weinberger]

Masahiro,

Am Dienstag, 3. Juli 2018, 03:50:12 CEST schrieb Masahiro Yamada:
> 
> At first, I sent the first patch to UML ML,
> but they did not pick it up.
> Instead, I was able to get Acked-by from Richard,
> one of the UML maintainers.
> 
> https://patchwork.kernel.org/patch/10399787/
> 
> I am resending it to x86 ML.

Uhh, I thought you want to carry this via your tree?
I don't mind picking up these patches.

Thanks,
//richard

Re: [PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Ingo Molnar]

* Richard Weinberger <richard@nod.at> wrote:

> Masahiro,
> 
> Am Dienstag, 3. Juli 2018, 03:50:12 CEST schrieb Masahiro Yamada:
> > 
> > At first, I sent the first patch to UML ML,
> > but they did not pick it up.
> > Instead, I was able to get Acked-by from Richard,
> > one of the UML maintainers.
> > 
> > https://patchwork.kernel.org/patch/10399787/
> > 
> > I am resending it to x86 ML.
> 
> Uhh, I thought you want to carry this via your tree?
> I don't mind picking up these patches.

I already picked them up, as one of them affects the x86 tree.

Is that OK?

Thanks,

	Ingo

Re: [PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Masahiro Yamada]

2018-07-03 16:35 GMT+09:00 Ingo Molnar <mingo@kernel.org>:
>
> * Richard Weinberger <richard@nod.at> wrote:
>
>> Masahiro,
>>
>> Am Dienstag, 3. Juli 2018, 03:50:12 CEST schrieb Masahiro Yamada:
>> >
>> > At first, I sent the first patch to UML ML,
>> > but they did not pick it up.
>> > Instead, I was able to get Acked-by from Richard,
>> > one of the UML maintainers.
>> >
>> > https://patchwork.kernel.org/patch/10399787/
>> >
>> > I am resending it to x86 ML.
>>
>> Uhh, I thought you want to carry this via your tree?
>> I don't mind picking up these patches.
>
> I already picked them up, as one of them affects the x86 tree.
>
> Is that OK?
>
> Thanks,
>
>         Ingo


No problem on my side.

Thank you!


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Richard Weinberger]

Am Dienstag, 3. Juli 2018, 09:35:33 CEST schrieb Ingo Molnar:
> 
> * Richard Weinberger <richard@nod.at> wrote:
> 
> > Masahiro,
> > 
> > Am Dienstag, 3. Juli 2018, 03:50:12 CEST schrieb Masahiro Yamada:
> > > 
> > > At first, I sent the first patch to UML ML,
> > > but they did not pick it up.
> > > Instead, I was able to get Acked-by from Richard,
> > > one of the UML maintainers.
> > > 
> > > https://patchwork.kernel.org/patch/10399787/
> > > 
> > > I am resending it to x86 ML.
> > 
> > Uhh, I thought you want to carry this via your tree?
> > I don't mind picking up these patches.
> 
> I already picked them up, as one of them affects the x86 tree.
> 
> Is that OK?

Perfectly fine with me.

Thanks,
//richard

[tip:x86/asm] x86/build/vdso: Remove unused vdso-syms.lds

[tip-bot for Masahiro Yamada]

Commit-ID:  b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Gitweb:     https://git.kernel.org/tip/b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Author:     Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 3 Jul 2018 10:50:13 +0900
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 3 Jul 2018 09:20:07 +0200

x86/build/vdso: Remove unused vdso-syms.lds

This file contains symbol values, and was originally linked into
vmlinux, but I have no idea what it was actually used for.

Since the following commit:

  827880ec260b ("x86/um: thin archives build fix")

it is not even linked.  Now it is completely orphan, and no problem has
been reported.  It is a proof that this file was not needed in the
first place.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Richard Weinberger <richard@nod.at>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-um@lists.infradead.org
Link: http://lkml.kernel.org/r/1530582614-5173-2-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/um/vdso/.gitignore |  1 -
 arch/x86/um/vdso/Makefile   | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/arch/x86/um/vdso/.gitignore b/arch/x86/um/vdso/.gitignore
index 9cac6d072199..f8b69d84238e 100644
--- a/arch/x86/um/vdso/.gitignore
+++ b/arch/x86/um/vdso/.gitignore
@@ -1,2 +1 @@
-vdso-syms.lds
 vdso.lds
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index b2d6967262b2..822ccdba93ad 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -53,22 +53,6 @@ $(vobjs): KBUILD_CFLAGS += $(CFL)
 CFLAGS_REMOVE_vdso-note.o = -pg -fprofile-arcs -ftest-coverage
 CFLAGS_REMOVE_um_vdso.o = -pg -fprofile-arcs -ftest-coverage
 
-targets += vdso-syms.lds
-extra-$(VDSO64-y)			+= vdso-syms.lds
-
-#
-# Match symbols in the DSO that look like VDSO*; produce a file of constants.
-#
-sed-vdsosym := -e 's/^00*/0/' \
-	-e 's/^\([0-9a-fA-F]*\) . \(VDSO[a-zA-Z0-9_]*\)$$/\2 = 0x\1;/p'
-quiet_cmd_vdsosym = VDSOSYM $@
-define cmd_vdsosym
-	$(NM) $< | LC_ALL=C sed -n $(sed-vdsosym) | LC_ALL=C sort > $@
-endef
-
-$(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
-	$(call if_changed,vdsosym)
-
 #
 # The DSO images are built using a special linker script.
 #

[tip:x86/asm] x86/build/vdso: Simplify 'cmd_vdso2c'

[tip-bot for Masahiro Yamada]

Commit-ID:  c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Gitweb:     https://git.kernel.org/tip/c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Author:     Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 3 Jul 2018 10:50:14 +0900
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 3 Jul 2018 09:20:08 +0200

x86/build/vdso: Simplify 'cmd_vdso2c'

No reason to use 'define' directive here.  Just use the = operator.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Andy Lutomirski <luto@kernel.org>
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/1530582614-5173-3-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/entry/vdso/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 261802b1cc50..b9ed1aa53a26 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -58,9 +58,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(src
 hostprogs-y			+= vdso2c
 
 quiet_cmd_vdso2c = VDSO2C  $@
-define cmd_vdso2c
-	$(obj)/vdso2c $< $(<:%.dbg=%) $@
-endef
+      cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
 
 $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
 	$(call if_changed,vdso2c)

Re: [PATCH 0/2] x86/build/vdso: a little more Makefile cleanups

[Ingo Molnar]

* Richard Weinberger <richard@nod.at> wrote:

> Am Dienstag, 3. Juli 2018, 09:35:33 CEST schrieb Ingo Molnar:
> > 
> > * Richard Weinberger <richard@nod.at> wrote:
> > 
> > > Masahiro,
> > > 
> > > Am Dienstag, 3. Juli 2018, 03:50:12 CEST schrieb Masahiro Yamada:
> > > > 
> > > > At first, I sent the first patch to UML ML,
> > > > but they did not pick it up.
> > > > Instead, I was able to get Acked-by from Richard,
> > > > one of the UML maintainers.
> > > > 
> > > > https://patchwork.kernel.org/patch/10399787/
> > > > 
> > > > I am resending it to x86 ML.
> > > 
> > > Uhh, I thought you want to carry this via your tree?
> > > I don't mind picking up these patches.
> > 
> > I already picked them up, as one of them affects the x86 tree.
> > 
> > Is that OK?
> 
> Perfectly fine with me.

Thanks! Timing for upstream merge would be v4.18.

	Ingo