mirror of
https://git.freebsd.org/ports.git
synced 2025-06-22 05:00:30 -04:00
4d4d3ba6f1
In qemu-cheri: * Fix build with llvm10 [0] * Remove the 256-bit capability version * Add CHERI RISC-V PR: 244768 [0] Submitted by: dim [0] Sponsored by: DARPA
52 lines
2.6 KiB
Text
52 lines
2.6 KiB
Text
--- configure.orig 2019-12-09 17:14:11 UTC
|
|
+++ configure
|
|
@@ -6358,27 +6358,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ]
|
|
cat > $TMPC <<EOF
|
|
int main(void) { return 0; }
|
|
EOF
|
|
- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
|
|
+ textseg_ldflags="-Wl,--image-base=$textseg_addr"
|
|
if ! compile_prog "" "$textseg_ldflags"; then
|
|
- # In case ld does not support -Ttext-segment, edit the default linker
|
|
- # script via sed to set the .text start addr. This is needed on FreeBSD
|
|
- # at least.
|
|
- if ! $ld --verbose >/dev/null 2>&1; then
|
|
- error_exit \
|
|
- "We need to link the QEMU user mode binaries at a" \
|
|
- "specific text address. Unfortunately your linker" \
|
|
- "doesn't support either the -Ttext-segment option or" \
|
|
- "printing the default linker script with --verbose." \
|
|
- "If you don't want the user mode binaries, pass the" \
|
|
- "--disable-user option to configure."
|
|
- fi
|
|
+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
|
|
+ if ! compile_prog "" "$textseg_ldflags"; then
|
|
+ # In case ld does not support -Ttext-segment, edit the default linker
|
|
+ # script via sed to set the .text start addr. This is needed on FreeBSD
|
|
+ # at least.
|
|
+ if ! $ld --verbose >/dev/null 2>&1; then
|
|
+ error_exit \
|
|
+ "We need to link the QEMU user mode binaries at a" \
|
|
+ "specific text address. Unfortunately your linker" \
|
|
+ "doesn't support either the -Ttext-segment option or" \
|
|
+ "printing the default linker script with --verbose." \
|
|
+ "If you don't want the user mode binaries, pass the" \
|
|
+ "--disable-user option to configure."
|
|
+ fi
|
|
|
|
- $ld --verbose | sed \
|
|
- -e '1,/==================================================/d' \
|
|
- -e '/==================================================/,$d' \
|
|
- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
|
|
- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
|
|
- textseg_ldflags="-Wl,-T../config-host.ld"
|
|
+ $ld --verbose | sed \
|
|
+ -e '1,/==================================================/d' \
|
|
+ -e '/==================================================/,$d' \
|
|
+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
|
|
+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
|
|
+ textseg_ldflags="-Wl,-T../config-host.ld"
|
|
+ fi
|
|
fi
|
|
fi
|
|
fi
|