diff options
author | Nico Weber <thakis@chromium.org> | 2021-08-27 22:07:21 -0400 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-08-28 14:43:07 +0100 |
commit | 61b6f69947ccdf01c3abf3733b2220305860d4ad (patch) | |
tree | 54f8f9efdf4595eac8e0fde3171065d5ef8078c3 /Toolchain/Patches/binutils.patch | |
parent | 21dafc11d599c8f6a2936f92ab5b74ee0b38af76 (diff) | |
download | serenity-61b6f69947ccdf01c3abf3733b2220305860d4ad.zip |
Toolchain: Regenerate binutils.patch and gcc.patch
I locally modified Meta/serenity.sh to pass `--dev` to BuildIt.sh
in build_toolchain(). Then I ran `Meta/serenity.sh rebuild-toolchain`,
cd'd into Toolchain/Tarballs/binutils-2.37, `git add`ed unadded files in
`git status`, and then ran `git diff > ../../Patches/binutils.patch`.
Then I did the same for Toolchain/Tarballs/gcc-11.2.0 (and was careful
not to `git add` serenity-kernel.h, since that's created by
Toolchain/BuildIt.sh).
No behavior change. This just rewrites the patch like git writes it.
Diffstat (limited to 'Toolchain/Patches/binutils.patch')
-rw-r--r-- | Toolchain/Patches/binutils.patch | 147 |
1 files changed, 80 insertions, 67 deletions
diff --git a/Toolchain/Patches/binutils.patch b/Toolchain/Patches/binutils.patch index d0512e1aa6..5f0560ab14 100644 --- a/Toolchain/Patches/binutils.patch +++ b/Toolchain/Patches/binutils.patch @@ -1,7 +1,8 @@ -diff -Naur binutils-2.37/bfd/config.bfd binutils-2.37.serenity/bfd/config.bfd ---- binutils-2.37/bfd/config.bfd 2021-07-08 13:37:19.000000000 +0200 -+++ binutils-2.37.serenity/bfd/config.bfd 2021-07-28 18:03:58.972705458 +0200 -@@ -223,7 +223,24 @@ +diff --git a/bfd/config.bfd b/bfd/config.bfd +index 30087e3b..7658cf30 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -223,7 +223,24 @@ esac case "${targ}" in # START OF targmatch.h @@ -26,10 +27,11 @@ diff -Naur binutils-2.37/bfd/config.bfd binutils-2.37.serenity/bfd/config.bfd aarch64-*-darwin*) targ_defvec=aarch64_mach_o_vec targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" -diff -Naur binutils-2.37/config.sub binutils-2.37.serenity/config.sub ---- binutils-2.37/config.sub 2021-07-08 13:37:19.000000000 +0200 -+++ binutils-2.37.serenity/config.sub 2021-07-28 18:03:58.972705458 +0200 -@@ -1700,6 +1700,7 @@ +diff --git a/config.sub b/config.sub +index 7384e919..aa02c3f6 100755 +--- a/config.sub ++++ b/config.sub +@@ -1700,6 +1700,7 @@ case $os in # The portable systems comes first. # Each alternative MUST end in a * to match a version number. gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ @@ -37,10 +39,11 @@ diff -Naur binutils-2.37/config.sub binutils-2.37.serenity/config.sub | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ -diff -Naur binutils-2.37/gas/configure.tgt binutils-2.37.serenity/gas/configure.tgt ---- binutils-2.37/gas/configure.tgt 2021-07-08 13:37:19.000000000 +0200 -+++ binutils-2.37.serenity/gas/configure.tgt 2021-07-28 18:03:58.972705458 +0200 -@@ -123,6 +123,8 @@ +diff --git a/gas/configure.tgt b/gas/configure.tgt +index 338892ad..0cac7829 100644 +--- a/gas/configure.tgt ++++ b/gas/configure.tgt +@@ -123,6 +123,8 @@ esac generic_target=${cpu_type}-$vendor-$os # Note: This table is alpha-sorted, please try to keep it that way. case ${generic_target} in @@ -49,10 +52,51 @@ diff -Naur binutils-2.37/gas/configure.tgt binutils-2.37.serenity/gas/configure. aarch64*-*-elf*) fmt=elf;; aarch64*-*-fuchsia*) fmt=elf;; aarch64*-*-genode*) fmt=elf;; -diff -Naur binutils-2.37/ld/configure.tgt binutils-2.37.serenity/ld/configure.tgt ---- binutils-2.37/ld/configure.tgt 2021-07-08 13:37:20.000000000 +0200 -+++ binutils-2.37.serenity/ld/configure.tgt 2021-07-28 18:03:58.972705458 +0200 -@@ -43,6 +43,19 @@ +diff --git a/ld/Makefile.am b/ld/Makefile.am +index f8e99325..bc55fd2b 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -174,6 +174,7 @@ ALL_EMULATION_SOURCES = \ + earmelf_nbsd.c \ + earmelf_phoenix.c \ + earmelf_vxworks.c \ ++ earmelf_serenity.c \ + earmelfb.c \ + earmelfb_fbsd.c \ + earmelfb_fuchsia.c \ +diff --git a/ld/Makefile.in b/ld/Makefile.in +index ef2e99e0..657d24a2 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -664,6 +664,7 @@ ALL_EMULATION_SOURCES = \ + earmelf_nbsd.c \ + earmelf_phoenix.c \ + earmelf_vxworks.c \ ++ earmelf_serenity.c \ + earmelfb.c \ + earmelfb_fbsd.c \ + earmelfb_fuchsia.c \ +@@ -774,6 +775,7 @@ ALL_EMULATION_SOURCES = \ + eelf_i386_vxworks.c \ + eelf_iamcu.c \ + eelf_s390.c \ ++ eelf_i386_serenity.c \ + eh8300elf.c \ + eh8300elf_linux.c \ + eh8300helf.c \ +@@ -945,6 +947,7 @@ ALL_64_EMULATION_SOURCES = \ + eelf_x86_64_cloudabi.c \ + eelf_x86_64_fbsd.c \ + eelf_x86_64_sol2.c \ ++ eelf_x86_64_serenity.c \ + ehppa64linux.c \ + ei386pep.c \ + emmo.c +diff --git a/ld/configure.tgt b/ld/configure.tgt +index 6205d7c9..390c10d7 100644 +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -43,6 +43,19 @@ targ64_extra_libpath= # Please try to keep this table more or less in alphabetic order - it # makes it much easier to lookup a specific archictecture. case "${targ}" in @@ -72,9 +116,11 @@ diff -Naur binutils-2.37/ld/configure.tgt binutils-2.37.serenity/ld/configure.tg aarch64_be-*-elf) targ_emul=aarch64elfb targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b armelfb armelf" ;; -diff -Naur binutils-2.37/ld/emulparams/armelf_serenity.sh binutils-2.37.serenity/ld/emulparams/armelf_serenity.sh ---- binutils-2.37/ld/emulparams/armelf_serenity.sh 1970-01-01 01:00:00.000000000 +0100 -+++ binutils-2.37.serenity/ld/emulparams/armelf_serenity.sh 2021-07-28 18:03:58.972705458 +0200 +diff --git a/ld/emulparams/armelf_serenity.sh b/ld/emulparams/armelf_serenity.sh +new file mode 100644 +index 00000000..517cd626 +--- /dev/null ++++ b/ld/emulparams/armelf_serenity.sh @@ -0,0 +1,7 @@ +. ${srcdir}/emulparams/armelf.sh +MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" @@ -83,60 +129,27 @@ diff -Naur binutils-2.37/ld/emulparams/armelf_serenity.sh binutils-2.37.serenity + +unset STACK_ADDR +unset EMBEDDED -diff -Naur binutils-2.37/ld/emulparams/elf_i386_serenity.sh binutils-2.37.serenity/ld/emulparams/elf_i386_serenity.sh ---- binutils-2.37/ld/emulparams/elf_i386_serenity.sh 1970-01-01 01:00:00.000000000 +0100 -+++ binutils-2.37.serenity/ld/emulparams/elf_i386_serenity.sh 2021-07-28 18:03:58.972705458 +0200 +diff --git a/ld/emulparams/elf_i386_serenity.sh b/ld/emulparams/elf_i386_serenity.sh +new file mode 100644 +index 00000000..342d5298 +--- /dev/null ++++ b/ld/emulparams/elf_i386_serenity.sh @@ -0,0 +1,3 @@ +. ${srcdir}/emulparams/elf_i386.sh +GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes -diff -Naur binutils-2.37/ld/emulparams/elf_x86_64_serenity.sh binutils-2.37.serenity/ld/emulparams/elf_x86_64_serenity.sh ---- binutils-2.37/ld/emulparams/elf_x86_64_serenity.sh 1970-01-01 01:00:00.000000000 +0100 -+++ binutils-2.37.serenity/ld/emulparams/elf_x86_64_serenity.sh 2021-07-28 18:03:58.972705458 +0200 +diff --git a/ld/emulparams/elf_x86_64_serenity.sh b/ld/emulparams/elf_x86_64_serenity.sh +new file mode 100644 +index 00000000..a2af90a6 +--- /dev/null ++++ b/ld/emulparams/elf_x86_64_serenity.sh @@ -0,0 +1 @@ +. ${srcdir}/emulparams/elf_x86_64.sh -diff -Naur binutils-2.37/ld/Makefile.am binutils-2.37.serenity/ld/Makefile.am ---- binutils-2.37/ld/Makefile.am 2021-07-08 13:37:20.000000000 +0200 -+++ binutils-2.37.serenity/ld/Makefile.am 2021-07-28 18:03:58.972705458 +0200 -@@ -174,6 +174,7 @@ - earmelf_nbsd.c \ - earmelf_phoenix.c \ - earmelf_vxworks.c \ -+ earmelf_serenity.c \ - earmelfb.c \ - earmelfb_fbsd.c \ - earmelfb_fuchsia.c \ -diff -Naur binutils-2.37/ld/Makefile.in binutils-2.37.serenity/ld/Makefile.in ---- binutils-2.37/ld/Makefile.in 2021-07-18 18:38:34.000000000 +0200 -+++ binutils-2.37.serenity/ld/Makefile.in 2021-07-28 18:03:58.972705458 +0200 -@@ -664,6 +664,7 @@ - earmelf_nbsd.c \ - earmelf_phoenix.c \ - earmelf_vxworks.c \ -+ earmelf_serenity.c \ - earmelfb.c \ - earmelfb_fbsd.c \ - earmelfb_fuchsia.c \ -@@ -774,6 +775,7 @@ - eelf_i386_vxworks.c \ - eelf_iamcu.c \ - eelf_s390.c \ -+ eelf_i386_serenity.c \ - eh8300elf.c \ - eh8300elf_linux.c \ - eh8300helf.c \ -@@ -945,6 +947,7 @@ - eelf_x86_64_cloudabi.c \ - eelf_x86_64_fbsd.c \ - eelf_x86_64_sol2.c \ -+ eelf_x86_64_serenity.c \ - ehppa64linux.c \ - ei386pep.c \ - emmo.c -diff -Naur binutils-2.37/libiberty/rust-demangle.c binutils-2.37.serenity/libiberty/rust-demangle.c ---- binutils-2.37/libiberty/rust-demangle.c 2021-07-15 16:19:46.000000000 +0200 -+++ binutils-2.37.serenity/libiberty/rust-demangle.c 2021-07-28 18:14:23.231031885 +0200 -@@ -75,10 +75,10 @@ +diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c +index df09b7b8..21566f5f 100644 +--- a/libiberty/rust-demangle.c ++++ b/libiberty/rust-demangle.c +@@ -75,10 +75,10 @@ struct rust_demangler int version; /* Recursion depth. */ |