Attachment 212358 Details for Bug 244768 – Fix emulators/qemu-cheri build with lld 10.0.0

[patch] Fix emulators/qemu-cheri build with lld 10.0.0

emulators__qemu-cheri-fix-lld10-build-1.diff (text/plain), 3.24 KB, created by Dimitry Andric on 2020-03-12 20:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-03-12 20:50:48 UTC

Size: 3.24 KB

patch

obsolete

>Index: emulators/qemu-cheri/files/patch-configure
>===================================================================
>--- emulators/qemu-cheri/files/patch-configure	(nonexistent)
>+++ emulators/qemu-cheri/files/patch-configure	(working copy)
>@@ -0,0 +1,52 @@
>+--- 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
>
>Property changes on: emulators/qemu-cheri/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244768: 212358