Skip to content

Commit 034827c

Browse files
James Hoganralfbaechle
authored andcommitted
MIPS: Fix -mabi=64 build of vdso.lds
The native ABI vDSO linker script vdso.lds is built by preprocessing vdso.lds.S, with the native -mabi flag passed in to get the correct ABI definitions. Unfortunately however certain toolchains choke on -mabi=64 without a corresponding compatible -march flag, for example: cc1: error: ‘-march=mips32r2’ is not compatible with the selected ABI scripts/Makefile.build:338: recipe for target 'arch/mips/vdso/vdso.lds' failed Fix this by including ccflags-vdso in the KBUILD_CPPFLAGS for vdso.lds, which includes the appropriate -march flag. Fixes: ebb5e78 ("MIPS: Initial implementation of a VDSO") Signed-off-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Maciej W. Rozycki <macro@imgtec.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org # 4.4.x- Patchwork: https://patchwork.linux-mips.org/patch/14368/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent cabca8c commit 034827c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ obj-vdso := $(obj-vdso-y:%.o=$(obj)/%.o)
8282
$(obj-vdso): KBUILD_CFLAGS := $(cflags-vdso) $(native-abi)
8383
$(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi)
8484

85-
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi)
85+
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi)
8686

8787
$(obj)/vdso.so.dbg.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
8888
$(call if_changed,vdsold)

0 commit comments

Comments
 (0)