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

Commit 577d9460 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fix from Ingo Molnar:
 "A single build system bugfix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix flip/flop vdso build bug
parents 50ec1881 e9a1379f

arch/x86/entry/vdso/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \ 
			-z max-page-size=4096



$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE

	$(call if_changed,vdso)

	$(call if_changed,vdso_check)

	$(call if_changed,vdso_and_check)



HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi

hostprogs-y			+= vdso2c
@@ -127,8 +126,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE

	$(call if_changed,vdso)

	$(call if_changed,vdso_check)

	$(call if_changed,vdso_and_check)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1
@@ -167,8 +165,7 @@ $(obj)/vdso32.so.dbg: FORCE \ 
		      $(obj)/vdso32/note.o \

		      $(obj)/vdso32/system_call.o \

		      $(obj)/vdso32/sigreturn.o

	$(call if_changed,vdso)

	$(call if_changed,vdso_check)

	$(call if_changed,vdso_and_check)



#

# The DSO images are built using a special linker script.
@@ -184,6 +181,9 @@ VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ 
	-Bsymbolic

GCOV_PROFILE := n



quiet_cmd_vdso_and_check = VDSO    $@

      cmd_vdso_and_check = $(cmd_vdso); $(cmd_vdso_check)



#

# Install the unstripped copies of vdso*.so.  If our toolchain supports

# build-id, install .build-id links as well.