Toolchain: Enable RELRO support for AArch64

The BFD linker requires the `COMMONPAGESIZE` emulation parameter to be
set in order to enable RELRO support for AArch64. As we are adding a
custom `emulparams` file anyways, let's also tell LD that our ELF
interpreter is called `/usr/lib/Loader.so`.

This commit also removes some vestigial references to i686 SerenityOS.
The one in `gas/configure.tgt` is still needed, as it also handles
x86_64.

2 files changed, 133 insertions, 44 deletions

diff --git a/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch b/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
index d02683d1aa..722cc0cd7a 100644
--- a/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
+++ b/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
@@ -5,19 +5,32 @@ Subject: [PATCH] Add support for SerenityOS
 
 Teaches the assembler, BFD, and the linker about the SerenityOS target
 triple.
+
+We set '/' to not start a comment in GAS, as the QEMU port uses it for
+division in constant expressions in assembly files (cf. as --divide).
+
+`/usr/lib/Loader.so` is set as the default ELF interpreter.
+
+On AArch64, we set `COMMONPAGESIZE` to enable RELRO support.
 ---
- bfd/config.bfd           | 15 +++++++++++++++
- gas/config/tc-i386.c     |  3 ++-
- gas/config/te-serenity.h |  3 +++
- gas/configure.tgt        |  2 ++
- ld/Makefile.am           |  1 +
- ld/Makefile.in           |  1 +
- ld/configure.tgt         |  9 +++++++++
- 7 files changed, 33 insertions(+), 1 deletion(-)
+ bfd/config.bfd                       | 10 ++++++++++
+ gas/config/tc-i386.c                 |  3 ++-
+ gas/config/te-serenity.h             |  3 +++
+ gas/configure.tgt                    |  2 ++
+ ld/Makefile.am                       |  4 ++++
+ ld/Makefile.in                       |  6 ++++++
+ ld/configure.tgt                     |  6 ++++++
+ ld/emulparams/aarch64serenity.sh     |  5 +++++
+ ld/emulparams/elf_serenity.sh        |  1 +
+ ld/emulparams/elf_x86_64_serenity.sh |  2 ++
+ 10 files changed, 41 insertions(+), 1 deletion(-)
  create mode 100644 gas/config/te-serenity.h
+ create mode 100644 ld/emulparams/aarch64serenity.sh
+ create mode 100644 ld/emulparams/elf_serenity.sh
+ create mode 100644 ld/emulparams/elf_x86_64_serenity.sh
 
 diff --git a/bfd/config.bfd b/bfd/config.bfd
-index cdd4a2b..b943f2e 100644
+index 1b0111fd410dcef529bc4d94e2c314678cdd4a2b..e488c40982f8ddb62861aa333dffeb06341f56f8 100644
 --- a/bfd/config.bfd
 +++ b/bfd/config.bfd
 @@ -285,6 +285,11 @@ case "${targ}" in
@@ -32,19 +45,7 @@ index cdd4a2b..b943f2e 100644
    aarch64-*-linux* | aarch64-*-netbsd*)
      targ_defvec=aarch64_elf64_le_vec
      targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec aarch64_pe_le_vec"
-@@ -666,6 +671,11 @@ case "${targ}" in
-     targ_selvecs=
-     targ64_selvecs=x86_64_elf64_vec
-     ;;
-+  i[3-7]86-*-serenity*)
-+    targ_defvec=i386_elf32_vec
-+    targ_selvecs=
-+    targ64_selvecs=x86_64_elf64_vec
-+    ;;
- #ifdef BFD64
-   x86_64-*-cloudabi*)
-     targ_defvec=x86_64_elf64_cloudabi_vec
-@@ -736,6 +746,11 @@ case "${targ}" in
+@@ -736,6 +741,11 @@ case "${targ}" in
      targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec"
      want64=true
      ;;
@@ -57,7 +58,7 @@ index cdd4a2b..b943f2e 100644
    i[3-7]86-*-lynxos*)
      targ_defvec=i386_elf32_vec
 diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
-index c5f124d..3b969dc 100644
+index 66d5ea5a99da47a61bf18623f6bd09b10c5f124d..5bc391ab7c3ee5028b91e5652e978daef0bc33d1 100644
 --- a/gas/config/tc-i386.c
 +++ b/gas/config/tc-i386.c
 @@ -492,7 +492,8 @@ const char extra_symbol_chars[] = "*%-([{}"
@@ -80,7 +81,7 @@ index 0000000000000000000000000000000000000000..f38faf598cba7f561ed9528ee3732822
 +
 +#define TE_SerenityOS 1
 diff --git a/gas/configure.tgt b/gas/configure.tgt
-index 98205c3..4961fde 100644
+index 765ba73633df54b51eec560002cc234ce98205c3..563d61e5fd50d7936a357cc46740ebe114961fde 100644
 --- a/gas/configure.tgt
 +++ b/gas/configure.tgt
 @@ -134,6 +134,7 @@ case ${generic_target} in
@@ -100,10 +101,18 @@ index 98205c3..4961fde 100644
    ia16-*-elf*)				fmt=elf ;;
  
 diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 001483f..dad8105 100644
+index 12b2c3c453fdbdb1fcac74bf5047bc4d0001483f..715b8156c183b12325a78937db6881350a9d0377 100644
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -457,6 +457,7 @@ ALL_64_EMULATION_SOURCES = \
+@@ -389,6 +389,7 @@ ALL_64_EMULATION_SOURCES = \
+ 	eaarch64linux32b.c \
+ 	eaarch64linuxb.c \
+ 	eaarch64pe.c \
++	eaarch64serenity.c \
+ 	eelf32_x86_64.c \
+ 	eelf32b4300.c \
+ 	eelf32bmip.c \
+@@ -457,6 +458,7 @@ ALL_64_EMULATION_SOURCES = \
  	eelf_x86_64_cloudabi.c \
  	eelf_x86_64_fbsd.c \
  	eelf_x86_64_haiku.c \
@@ -111,11 +120,35 @@ index 001483f..dad8105 100644
  	eelf_x86_64_sol2.c \
  	ehppa64linux.c \
  	ei386pep.c \
+@@ -881,6 +883,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Pc@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmip.Pc@am__quote@
+@@ -949,6 +952,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
 diff --git a/ld/Makefile.in b/ld/Makefile.in
-index eaba463..b51922c 100644
+index 3d5685d6bae1ce6258f053190da8d84f9eaba463..64acb70753a26aa36b1e6bec17244821662f6dd9 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -957,6 +957,7 @@ ALL_64_EMULATION_SOURCES = \
+@@ -889,6 +889,7 @@ ALL_64_EMULATION_SOURCES = \
+ 	eaarch64linux32b.c \
+ 	eaarch64linuxb.c \
+ 	eaarch64pe.c \
++	eaarch64serenity.c \
+ 	eelf32_x86_64.c \
+ 	eelf32b4300.c \
+ 	eelf32bmip.c \
+@@ -957,6 +958,7 @@ ALL_64_EMULATION_SOURCES = \
  	eelf_x86_64_cloudabi.c \
  	eelf_x86_64_fbsd.c \
  	eelf_x86_64_haiku.c \
@@ -123,37 +156,85 @@ index eaba463..b51922c 100644
  	eelf_x86_64_sol2.c \
  	ehppa64linux.c \
  	ei386pep.c \
+@@ -1266,6 +1268,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5ppc.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5rs6.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaixppc.Po@am__quote@
+@@ -1465,6 +1468,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Po@am__quote@
+@@ -2555,6 +2559,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Pc@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmip.Pc@am__quote@
+@@ -2623,6 +2628,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
 diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 41e95f2..ca99409 100644
+index de04a44b8125f08095b792285be5ddbaf41e95f2..56c8fda33834d4aa288d6b9c63596d09c44b0989 100644
 --- a/ld/configure.tgt
 +++ b/ld/configure.tgt
 @@ -97,6 +97,9 @@ aarch64-*-freebsd*)	targ_emul=aarch64fbsd
  aarch64-*-fuchsia*)	targ_emul=aarch64elf
  			targ_extra_emuls="aarch64elfb armelf armelfb"
  			;;
-+aarch64-*-serenity*)	targ_emul=aarch64elf
-+			targ_extra_emuls=
++aarch64-*-serenity*)	targ_emul=aarch64serenity
++			targ_extra_emuls=aarch64elf
 +			;;
  aarch64_be-*-linux-gnu_ilp32)
  			targ_emul=aarch64linux32b
  			targ_extra_libpath="aarch64linuxb aarch64linux aarch64linux32 armelfb_linux_eabi armelf_linux_eabi"
-@@ -374,6 +377,9 @@ i[3-7]86-*-linux-*)	targ_emul=elf_i386
- i[3-7]86-*-redox*)	targ_emul=elf_i386
- 			targ_extra_emuls=elf_x86_64
- 			;;
-+i[3-7]86-*-serenity*)	targ_emul=elf_i386
-+			targ64_extra_emuls="elf_x86_64"
-+			;;
- i[3-7]86-*-sysv[45]*)	targ_emul=elf_i386
- 			targ_extra_emuls=elf_iamcu
- 			;;
-@@ -1012,6 +1018,9 @@ x86_64-*-linux-*)	targ_emul=elf_x86_64
+@@ -1012,6 +1015,9 @@ x86_64-*-linux-*)	targ_emul=elf_x86_64
  x86_64-*-redox*)	targ_emul=elf_x86_64
  			targ_extra_emuls=elf_i386
  			;;
-+x86_64-*-serenity*)	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-*-solaris2*)	targ_emul=elf_x86_64_sol2
  			targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_iamcu"
  			targ_extra_libpath=$targ_extra_emuls
+diff --git a/ld/emulparams/aarch64serenity.sh b/ld/emulparams/aarch64serenity.sh
+new file mode 100644
+index 0000000000000000000000000000000000000000..23aed1440a033e2ac06536f43c1bacaf98832b92
+--- /dev/null
++++ b/ld/emulparams/aarch64serenity.sh
+@@ -0,0 +1,5 @@
++source_sh ${srcdir}/emulparams/aarch64elf.sh
++source_sh ${srcdir}/emulparams/elf_serenity.sh
++
++COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
++unset EMBEDDED
+diff --git a/ld/emulparams/elf_serenity.sh b/ld/emulparams/elf_serenity.sh
+new file mode 100644
+index 0000000000000000000000000000000000000000..c434bacaa7fa16a9bb1c4934ad061230fbf56825
+--- /dev/null
++++ b/ld/emulparams/elf_serenity.sh
+@@ -0,0 +1 @@
++ELF_INTERPRETER_NAME=\"/usr/lib/Loader.so\"
+diff --git a/ld/emulparams/elf_x86_64_serenity.sh b/ld/emulparams/elf_x86_64_serenity.sh
+new file mode 100644
+index 0000000000000000000000000000000000000000..536af1e31d761b22e3e40cafd339d5bf7a285756
+--- /dev/null
++++ b/ld/emulparams/elf_x86_64_serenity.sh
+@@ -0,0 +1,2 @@
++source_sh ${srcdir}/emulparams/elf_x86_64.sh
++source_sh ${srcdir}/emulparams/elf_serenity.sh
diff --git a/Toolchain/Patches/binutils/ReadMe.md b/Toolchain/Patches/binutils/ReadMe.md
index 8140bee76d..09dc18071d 100644
--- a/Toolchain/Patches/binutils/ReadMe.md
+++ b/Toolchain/Patches/binutils/ReadMe.md
@@ -6,3 +6,11 @@ Add support for SerenityOS
 
 Teaches the assembler, BFD, and the linker about the SerenityOS target
 triple.
+
+We set '/' to not start a comment in GAS, as the QEMU port uses it for
+division in constant expressions in assembly files (cf. as --divide).
+
+`/usr/lib/Loader.so` is set as the default ELF interpreter.
+
+On AArch64, we set `COMMONPAGESIZE` to enable RELRO support.
+