Skip to content

Commit

Permalink
Revert "powerpc/build: vdso linker warning for orphan sections"
Browse files Browse the repository at this point in the history
This reverts commit f2af201.

It added a usage of cc-ldoption, but cc-ldoption was removed in commit
055efab ("kbuild: drop support for cc-ldoption").

Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Sep 3, 2020
1 parent 675bceb commit 4c62285
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/vdso32/Makefile
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ $(obj-vdso32): %.o: %.S FORCE

# actual build commands
quiet_cmd_vdso32ld = VDSO32L $@
cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ $(call cc-ldoption, -Wl$(comma)--orphan-handling=warn) -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
quiet_cmd_vdso32as = VDSO32A $@
cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $<

1 change: 0 additions & 1 deletion arch/powerpc/kernel/vdso32/vdso32.lds.S
Original file line number Diff line number Diff line change
@@ -111,7 +111,6 @@ SECTIONS
*(.note.GNU-stack)
*(.data .data.* .gnu.linkonce.d.* .sdata*)
*(.bss .sbss .dynbss .dynsbss)
*(.glink .iplt .plt .rela*)
}
}

2 changes: 1 addition & 1 deletion arch/powerpc/kernel/vdso64/Makefile
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE

# actual build commands
quiet_cmd_vdso64ld = VDSO64L $@
cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) $(call cc-ldoption, -Wl$(comma)--orphan-handling=warn)
cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)

# install commands for the unstripped file
quiet_cmd_vdso_install = INSTALL $@
3 changes: 1 addition & 2 deletions arch/powerpc/kernel/vdso64/vdso64.lds.S
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ SECTIONS
. = ALIGN(16);
.text : {
*(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
*(.sfpr)
*(.sfpr .glink)
} :text
PROVIDE(__etext = .);
PROVIDE(_etext = .);
@@ -111,7 +111,6 @@ SECTIONS
*(.branch_lt)
*(.data .data.* .gnu.linkonce.d.* .sdata*)
*(.bss .sbss .dynbss .dynsbss)
*(.glink .iplt .plt .rela*)
}
}

0 comments on commit 4c62285

Please sign in to comment.