RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

Toolchain: Fix building the aarch64 toolchain

Browse source 
The `aarch64/t-aarch64` makefile fragment needs to be included for the
aarch64-specific parts of GCC to be built. Before 738e52da5, this was
done implicitly, but now it is not. This caused the following error when
building the toolchain: "aarch64-builtins.o: No such file or directory".
This commit is contained in:
Daniel Bertalan 2022-01-04 16:39:10 +01:00 • committed by Linus Groh
parent 0eb3718556
commit 84c6d6649e
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ports/gcc/patches/gcc.patch
View file

@ -46,7 +46,7 @@ index a75b44ee4..6fab7c3ca 100644
+ +
; This comment is to ensure we retain the blank line above. ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config.gcc b/gcc/config.gcc diff --git a/gcc/config.gcc b/gcc/config.gcc
index 357b0bed0..151d93312 100644 index 357b0bed0..8e96b74e5 100644
--- a/gcc/config.gcc --- a/gcc/config.gcc
+++ b/gcc/config.gcc +++ b/gcc/config.gcc
@@ -686,6 +686,13 @@ x86_cpus="generic intel" @@ -686,6 +686,13 @@ x86_cpus="generic intel"
@ -63,7 +63,7 @@ index 357b0bed0..151d93312 100644
*-*-darwin*) *-*-darwin*)
tmake_file="t-darwin " tmake_file="t-darwin "
tm_file="${tm_file} darwin.h" tm_file="${tm_file} darwin.h"
@@ -1084,6 +1091,18 @@ case ${target} in @@ -1084,6 +1091,19 @@ case ${target} in
esac esac
case ${target} in case ${target} in
@ -78,6 +78,7 @@ index 357b0bed0..151d93312 100644
+ ;; + ;;
+aarch64-*-serenity*) +aarch64-*-serenity*)
+ tm_file="${tm_file} dbxelf.h elfos.h aarch64/aarch64-elf.h glibc-stdint.h serenity.h" + tm_file="${tm_file} dbxelf.h elfos.h aarch64/aarch64-elf.h glibc-stdint.h serenity.h"
+ tmake_file="${tmake_file} aarch64/t-aarch64"
+ ;; + ;;
aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*) aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h"

5
Toolchain/Patches/gcc.patch
View file

@ -46,7 +46,7 @@ index a75b44ee4..6fab7c3ca 100644
+ +
; This comment is to ensure we retain the blank line above. ; This comment is to ensure we retain the blank line above.
diff --git a/gcc/config.gcc b/gcc/config.gcc diff --git a/gcc/config.gcc b/gcc/config.gcc
index 357b0bed0..151d93312 100644 index 357b0bed0..8e96b74e5 100644
--- a/gcc/config.gcc --- a/gcc/config.gcc
+++ b/gcc/config.gcc +++ b/gcc/config.gcc
@@ -686,6 +686,13 @@ x86_cpus="generic intel" @@ -686,6 +686,13 @@ x86_cpus="generic intel"
@ -63,7 +63,7 @@ index 357b0bed0..151d93312 100644
*-*-darwin*) *-*-darwin*)
tmake_file="t-darwin " tmake_file="t-darwin "
tm_file="${tm_file} darwin.h" tm_file="${tm_file} darwin.h"
@@ -1084,6 +1091,18 @@ case ${target} in @@ -1084,6 +1091,19 @@ case ${target} in
esac esac
case ${target} in case ${target} in
@ -78,6 +78,7 @@ index 357b0bed0..151d93312 100644
+ ;; + ;;
+aarch64-*-serenity*) +aarch64-*-serenity*)
+ tm_file="${tm_file} dbxelf.h elfos.h aarch64/aarch64-elf.h glibc-stdint.h serenity.h" + tm_file="${tm_file} dbxelf.h elfos.h aarch64/aarch64-elf.h glibc-stdint.h serenity.h"
+ tmake_file="${tmake_file} aarch64/t-aarch64"
+ ;; + ;;
aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*) aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h"