diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2021-12-22 13:32:09 +0100 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-06-21 22:38:15 +0100 |
| commit | 2df56f840f3764b5e1de400748812ee61e052ef8 (patch) | |
| tree | 2ed0b50e384835ea98d8f1b39b03f332d13d9222 | |
| parent | d2b87419ac0930c69ee015c1c300468b99e8ad6e (diff) | |
| download | serenity-2df56f840f3764b5e1de400748812ee61e052ef8.zip | |
Revert "Toolchain: Load x64 executables at a higher address"
Now that the lower pages can be unmapped and more of the virtual
address range is available to us, we can actually use the default
mapping address of x86_64 again.
This reverts commit 292398b5857d0104f7c33fdb5d79f45fe8b395dd.
| -rw-r--r-- | Toolchain/Patches/binutils.patch | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Toolchain/Patches/binutils.patch b/Toolchain/Patches/binutils.patch index 7d14c39266..04b058b29c 100644 --- a/Toolchain/Patches/binutils.patch +++ b/Toolchain/Patches/binutils.patch @@ -123,7 +123,7 @@ index c7acf3f1..19982e51 100644 targ_extra_emuls=elf_x86_64 ;; +i[3-7]86-*-serenity*) targ_emul=elf_i386 -+ targ64_extra_emuls="elf_x86_64_serenity elf_x86_64" ++ targ64_extra_emuls="elf_x86_64" + ;; i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 targ_extra_emuls=elf_iamcu @@ -132,20 +132,9 @@ index c7acf3f1..19982e51 100644 x86_64-*-redox*) targ_emul=elf_x86_64 targ_extra_emuls=elf_i386 ;; -+x86_64-*-serenity*) targ_emul=elf_x86_64_serenity -+ targ_extra_emuls="elf_x86_64 elf_i386" ++x86_64-*-serenity*) targ_emul=elf_x86_64 ++ targ_extra_emuls="elf_i386" + ;; x86_64-*-solaris2*) targ_emul=elf_x86_64_sol2 targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_iamcu elf_l1om elf_k1om" targ_extra_libpath=$targ_extra_emuls -diff --git a/ld/emulparams/elf_x86_64_serenity.sh b/ld/emulparams/elf_x86_64_serenity.sh -new file mode 100644 -index 00000000..973b3b2a ---- /dev/null -+++ b/ld/emulparams/elf_x86_64_serenity.sh -@@ -0,0 +1,2 @@ -+. ${srcdir}/emulparams/elf_x86_64.sh -+TEXT_START_ADDR=0x08200000 --- -2.35.1 - |