forked from freebsd/freebsd-ports
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update qemu-cheri and llvm-cheri to recent snapshots.
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
- Loading branch information
1 parent
ba8a881
commit ceba03b
Showing
10 changed files
with
135 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1576101834 | ||
| SHA256 (CTSRD-CHERI-llvm-project-10.0.d20191211-8cad6d336ad9e91657db9999fcd25adceae3be83_GH0.tar.gz) = 3401c91b43b768a380b9fc208aad223260541f1d8d1c317cff8de02adefd209a | ||
| SIZE (CTSRD-CHERI-llvm-project-10.0.d20191211-8cad6d336ad9e91657db9999fcd25adceae3be83_GH0.tar.gz) = 121667904 | ||
| TIMESTAMP = 1585007852 | ||
| SHA256 (CTSRD-CHERI-llvm-project-11.0.d20200309-b507d88d2aa61cec27adab60324a04b17911f5e4_GH0.tar.gz) = 5757ef569e4e3dde25e2a8ea41fd05235c9ed61be1662bab02a848cba09cb124 | ||
| SIZE (CTSRD-CHERI-llvm-project-11.0.d20200309-b507d88d2aa61cec27adab60324a04b17911f5e4_GH0.tar.gz) = 126759614 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |