Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42964c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 build updates from Ingo Molnar:
 "A handful of build system (Makefile, linker script) cleanups by
  Masahiro Yamada"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build/vdso: Put generated linker scripts to $(obj)/
  x86/build/vdso: Remove unnecessary export in Makefile
  x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile
  x86/build: Remove no-op macro VMLINUX_SYMBOL()
parents 1b246d22 1742ed20

arch/x86/entry/vdso/Makefile

+4 −7
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ 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 \

			-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
@@ -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)
@@ -122,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)

arch/x86/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -117,11 +117,11 @@ SECTIONS 


#ifdef CONFIG_X86_64

		. = ALIGN(PAGE_SIZE);

		VMLINUX_SYMBOL(__entry_trampoline_start) = .;

		__entry_trampoline_start = .;

		_entry_trampoline = .;

		*(.entry_trampoline)

		. = ALIGN(PAGE_SIZE);

		VMLINUX_SYMBOL(__entry_trampoline_end) = .;

		__entry_trampoline_end = .;

		ASSERT(. - _entry_trampoline == PAGE_SIZE, "entry trampoline is too big");

#endif

arch/x86/um/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ $(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



$(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