From f4711b38fdc9b8d3534e2184da930f42f5689ce1 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 30 Aug 2017 20:00:15 +0000 Subject: [PATCH] Compile reloc.o with -fno-jump-tables on MIPS. In particular, the switch statement on the type of dynamic entries in _rtld_relocate_nonplt_self() needs to not use a jump table since jump tables on MIPS use local GOT entries which aren't initialized until after this loop. Suggested by: arichardson Reviewed by: emaste Sponsored by: DARPA / AFRL --- libexec/rtld-elf/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 5c4ecb4fe95..e6841375d13 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -47,6 +47,9 @@ CFLAGS+= -DPIC $(DEBUG) .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -fvisibility=hidden .endif +.if ${MACHINE_CPUARCH} == "mips" +CFLAGS.reloc.c+=-fno-jump-tables +.endif LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs LIBADD= c_pic .if ${MK_TOOLCHAIN} == "no"