From be1dce26256aa9f6c7742e81c8c3db9eacff079d Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Fri, 5 Jan 2018 14:29:49 -0800 Subject: [PATCH] RISC-V: Disable shared library support for embedded elf. ld/ * emulparams/elf32lriscv-defs.sh (GENERATE_SHLIB_SCRIPT): Move inside case on $target, and don't set for riscv*-elf targets. (GENERATE_PIE_SCRIPT): Likewise. --- ld/ChangeLog | 6 ++++++ ld/emulparams/elf32lriscv-defs.sh | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 2b8e7c575c2..97032775e9d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2018-01-05 Jim Wilson + + * emulparams/elf32lriscv-defs.sh (GENERATE_SHLIB_SCRIPT): Move inside + case on $target, and don't set for riscv*-elf targets. + (GENERATE_PIE_SCRIPT): Likewise. + 2018-01-03 Alan Modra Update year range in copyright notice of all files. diff --git a/ld/emulparams/elf32lriscv-defs.sh b/ld/emulparams/elf32lriscv-defs.sh index 29ed6d8542a..f373eced89b 100644 --- a/ld/emulparams/elf32lriscv-defs.sh +++ b/ld/emulparams/elf32lriscv-defs.sh @@ -16,8 +16,15 @@ if test `echo "$host" | sed -e s/64//` = `echo "$target" | sed -e s/64//`; then esac fi -GENERATE_SHLIB_SCRIPT=yes -GENERATE_PIE_SCRIPT=yes +# Enable shared library support for everything except an embedded elf target. +case "$target" in + riscv*-elf) + ;; + *) + GENERATE_SHLIB_SCRIPT=yes + GENERATE_PIE_SCRIPT=yes + ;; +esac TEXT_START_ADDR=0x10000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -- 2.30.2