mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 21:17:45 +00:00
Toolchain: Regenerate patches using the latest format rules
This commit is contained in:
Tim Schumacher
Ali Mohammad Pur
parent
453323f3c1
commit
cb2f0d9861
19 changed files with 87 additions and 107 deletions
|
|
@ -1,7 +1,7 @@
|
|||
From 00ad6c7f79fffa5fe13a9e5b77ad06e987fde3e8 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Kling <awesomekling@gmail.com>
|
||||
Date: Fri, 5 Apr 2019 03:02:52 +0200
|
||||
Subject: [PATCH 1/6] Add a gcc driver for SerenityOS
|
||||
Subject: [PATCH] Add a gcc driver for SerenityOS
|
||||
|
||||
This patch adds support for the `*-*-serenity` target to gcc.
|
||||
|
||||
|
|
@ -19,17 +19,17 @@ Co-Authored-By: Brian Gianforcaro <bgianf@serenityos.org>
|
|||
Co-Authored-By: Philip Herron <herron.philip@googlemail.com>
|
||||
Co-Authored-By: Shannon Booth <shannon.ml.booth@gmail.com>
|
||||
---
|
||||
gcc/config.gcc | 20 ++++++++++++++++
|
||||
gcc/config.gcc | 20 +++++++++++++++
|
||||
gcc/config/i386/serenity.h | 7 ++++++
|
||||
gcc/config/serenity.h | 51 ++++++++++++++++++++++++++++++++++++++
|
||||
gcc/config/serenity.opt | 35 ++++++++++++++++++++++++++++
|
||||
4 files changed, 109 insertions(+)
|
||||
gcc/config/serenity.opt | 35 ++++++++++++++++++++++++++
|
||||
4 files changed, 113 insertions(+)
|
||||
create mode 100644 gcc/config/i386/serenity.h
|
||||
create mode 100644 gcc/config/serenity.h
|
||||
create mode 100644 gcc/config/serenity.opt
|
||||
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index c5064dd37..f8a468c6f 100644
|
||||
index c5064dd376660c192d5573997b4fc86b6b3e3838..f8a468c6f86c559eda37f780cf592245e42c78ac 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -673,6 +673,13 @@ x86_cpus="generic intel"
|
||||
|
|
@ -68,7 +68,7 @@ index c5064dd37..f8a468c6f 100644
|
|||
tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-errata.h aarch64/aarch64-elf-raw.h"
|
||||
diff --git a/gcc/config/i386/serenity.h b/gcc/config/i386/serenity.h
|
||||
new file mode 100644
|
||||
index 000000000..53a4b8e93
|
||||
index 0000000000000000000000000000000000000000..53a4b8e93b74b4808a4bfed91c4d5558217c584a
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/i386/serenity.h
|
||||
@@ -0,0 +1,7 @@
|
||||
|
|
@ -81,7 +81,7 @@ index 000000000..53a4b8e93
|
|||
+#define PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int")
|
||||
diff --git a/gcc/config/serenity.h b/gcc/config/serenity.h
|
||||
new file mode 100644
|
||||
index 000000000..dc2f5361e
|
||||
index 0000000000000000000000000000000000000000..17551aaa1a07e6c0b7365f98899375122ba12529
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/serenity.h
|
||||
@@ -0,0 +1,51 @@
|
||||
|
|
@ -138,7 +138,7 @@ index 000000000..dc2f5361e
|
|||
+ } while(0);
|
||||
diff --git a/gcc/config/serenity.opt b/gcc/config/serenity.opt
|
||||
new file mode 100644
|
||||
index 000000000..2756a5575
|
||||
index 0000000000000000000000000000000000000000..2756a5575480449a2c46b9fdfde541ba2787a263
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/serenity.opt
|
||||
@@ -0,0 +1,35 @@
|
||||
|
|
@ -177,6 +177,3 @@ index 000000000..2756a5575
|
|||
+Driver
|
||||
+
|
||||
+; This comment is to ensure we retain the blank line above.
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From e7d65e2c0943078214d9231cbb5c5e8eb9b5c726 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Kling <awesomekling@gmail.com>
|
||||
Date: Fri, 5 Apr 2019 03:02:52 +0200
|
||||
Subject: [PATCH 2/6] fixincludes: Skip for SerenityOS targets
|
||||
Subject: [PATCH] fixincludes: Skip for SerenityOS targets
|
||||
|
||||
`fixincludes` is responsible for fixing mistakes in system headers that
|
||||
rely in compiler extensions that GCC doesn't support or cause errors in
|
||||
|
|
@ -13,7 +13,7 @@ Our headers don't have such problems, so this hack is of no use for us.
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
|
||||
index df90720b7..a45cdd0de 100755
|
||||
index df90720b716f2386f343f5ba46a2d8d706188dd5..a45cdd0de6833a1e632292722387be453a079053 100755
|
||||
--- a/fixincludes/mkfixinc.sh
|
||||
+++ b/fixincludes/mkfixinc.sh
|
||||
@@ -11,6 +11,7 @@ target=fixinc.sh
|
||||
|
|
@ -24,6 +24,3 @@ index df90720b7..a45cdd0de 100755
|
|||
i?86-*-cygwin* | \
|
||||
i?86-*-mingw32* | \
|
||||
x86_64-*-mingw32* | \
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 9297a27635e83df95c644b9f776d65078c97162e Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Kling <awesomekling@gmail.com>
|
||||
Date: Mon, 16 May 2022 15:01:06 +0200
|
||||
Subject: [PATCH 3/6] libgcc: Build for SerenityOS
|
||||
Subject: [PATCH] libgcc: Build for SerenityOS
|
||||
|
||||
This patch enables building gcc's own C runtime files, and sets up
|
||||
exception handling support.
|
||||
|
|
@ -20,7 +20,7 @@ Co-Authored-By: Shannon Booth <shannon.ml.booth@gmail.com>
|
|||
3 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 5ce055771..2deaac5bc 100755
|
||||
index 5ce0557719a9fe0acf9a0f0ffaf949e9eeba0eb1..2deaac5bc85815a7e3efc47a935fb81fca9b24da 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -31608,6 +31608,9 @@ case "$target" in
|
||||
|
|
@ -34,7 +34,7 @@ index 5ce055771..2deaac5bc 100755
|
|||
|
||||
if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
|
||||
diff --git a/libgcc/config.host b/libgcc/config.host
|
||||
index 8c56fcae5..f5855cfa6 100644
|
||||
index 8c56fcae5d2fdfcc8d1f9b2614f0c41ad44f258f..f5855cfa66d7950c3d7565ad938b4e4727d7b46d 100644
|
||||
--- a/libgcc/config.host
|
||||
+++ b/libgcc/config.host
|
||||
@@ -1534,6 +1534,22 @@ nvptx-*)
|
||||
|
|
@ -61,7 +61,7 @@ index 8c56fcae5..f5855cfa6 100644
|
|||
echo "*** Configuration ${host} not supported" 1>&2
|
||||
exit 1
|
||||
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
|
||||
index 7f9be5e6b..817c3fe21 100644
|
||||
index 7f9be5e6b021a539278570ad202f1f9c45311ca1..817c3fe219252ab3e1707913ebd53dfd97616b58 100644
|
||||
--- a/libgcc/unwind-dw2-fde-dip.c
|
||||
+++ b/libgcc/unwind-dw2-fde-dip.c
|
||||
@@ -57,6 +57,12 @@
|
||||
|
|
@ -77,6 +77,3 @@ index 7f9be5e6b..817c3fe21 100644
|
|||
#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
||||
&& defined(TARGET_DL_ITERATE_PHDR) \
|
||||
&& defined(__linux__)
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c4e0f7d997b3f7cd5c5465a636e097e43170d609 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Kling <awesomekling@gmail.com>
|
||||
Date: Mon, 16 May 2022 15:03:14 +0200
|
||||
Subject: [PATCH 4/6] libgcc: Do not link libgcc_s to LibC
|
||||
Subject: [PATCH] libgcc: Do not link libgcc_s to LibC
|
||||
|
||||
The toolchain is built before LibC, so linking to the C runtime library
|
||||
would fail.
|
||||
|
|
@ -17,7 +17,7 @@ Co-Authored-By: Shannon Booth <shannon.ml.booth@gmail.com>
|
|||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc
|
||||
index 4efd7b43d..932fa0cfb 100644
|
||||
index 4efd7b43dff96b6adb87993e4c66cbcb5ae144dc..932fa0cfbdeff6bb029fcf4b44d93d126d1ecd5f 100644
|
||||
--- a/libgcc/config/t-slibgcc
|
||||
+++ b/libgcc/config/t-slibgcc
|
||||
@@ -26,7 +26,6 @@ SHLIB_MAP = @shlib_map_file@
|
||||
|
|
@ -28,6 +28,3 @@ index 4efd7b43d..932fa0cfb 100644
|
|||
SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
|
||||
SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
|
||||
$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 7cb91a236863aa5c582d25a920ffbb7408c10e2f Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Bertalan <dani@danielbertalan.dev>
|
||||
Date: Mon, 16 May 2022 15:04:33 +0200
|
||||
Subject: [PATCH 5/6] i386: Disable math errno for SerenityOS
|
||||
Subject: [PATCH] i386: Disable math errno for SerenityOS
|
||||
|
||||
SerenityOS uses exceptions for math error handling, which allows the
|
||||
compiler to do more optimizations on calls to math functions. This patch
|
||||
|
|
@ -11,7 +11,7 @@ has the effect of setting -fno-math-errno by default.
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/gcc/common/config/i386/i386-common.cc b/gcc/common/config/i386/i386-common.cc
|
||||
index 07fdd045f..6e2419563 100644
|
||||
index 07fdd045f3032a445a0be45fa62eab9636c3ce2f..6e241956311fbcee3d7e04c7a30f4b73cd61877f 100644
|
||||
--- a/gcc/common/config/i386/i386-common.cc
|
||||
+++ b/gcc/common/config/i386/i386-common.cc
|
||||
@@ -1707,6 +1707,10 @@ ix86_option_init_struct (struct gcc_options *opts)
|
||||
|
|
@ -25,6 +25,3 @@ index 07fdd045f..6e2419563 100644
|
|||
opts->x_flag_pcc_struct_return = 2;
|
||||
opts->x_flag_asynchronous_unwind_tables = 2;
|
||||
}
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
From b581fd421af5691bdafda7d30b20723f77d0cc88 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Kling <awesomekling@gmail.com>
|
||||
Date: Mon, 16 May 2022 15:08:53 +0200
|
||||
Subject: [PATCH 6/6] libstdc++: Support SerenityOS
|
||||
Subject: [PATCH] libstdc++: Support SerenityOS
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
During the toolchain build, SerenityOS libraries are not available, so
|
||||
we have to manually tell libstdc++ about what our LibC supports.
|
||||
|
|
@ -24,7 +27,7 @@ Co-Authored-By: Shannon Booth <shannon.ml.booth@gmail.com>
|
|||
4 files changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
|
||||
index 138bd58d8..6cd7564b6 100644
|
||||
index e3cc3a8e867d3428d34f2b4db9c47104a0385450..6e30c391dac74101321a52ca17d8215c05f87844 100644
|
||||
--- a/libstdc++-v3/acinclude.m4
|
||||
+++ b/libstdc++-v3/acinclude.m4
|
||||
@@ -1374,7 +1374,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
|
||||
|
|
@ -46,7 +49,7 @@ index 138bd58d8..6cd7564b6 100644
|
|||
;;
|
||||
*)
|
||||
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||
index 9b94fd71e..51e45878f 100755
|
||||
index eac6039212168e1cd33e1b6c2b938324fd403f12..11d23dba48e5799c31335f71911e1c4dca65a245 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -11914,6 +11914,11 @@ else
|
||||
|
|
@ -89,7 +92,7 @@ index 9b94fd71e..51e45878f 100755
|
|||
|
||||
$as_echo "#define HAVE_ASINF 1" >>confdefs.h
|
||||
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
|
||||
index ec32980aa..e060300f3 100644
|
||||
index ec32980aa0db898623804980af65dad588e4d9f5..e060300f3777fbd38795954ca75e9c4809cfc4e3 100644
|
||||
--- a/libstdc++-v3/configure.host
|
||||
+++ b/libstdc++-v3/configure.host
|
||||
@@ -297,6 +297,9 @@ case "${host_os}" in
|
||||
|
|
@ -103,7 +106,7 @@ index ec32980aa..e060300f3 100644
|
|||
os_include_dir="os/solaris"
|
||||
;;
|
||||
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
|
||||
index ae5283b7a..b9fc96e94 100644
|
||||
index ae5283b7ad378934b409455e7409ac9cac26a20a..b9fc96e942cba64aa76de1decc0daa9999fd53e9 100644
|
||||
--- a/libstdc++-v3/crossconfig.m4
|
||||
+++ b/libstdc++-v3/crossconfig.m4
|
||||
@@ -9,7 +9,7 @@ case "${host}" in
|
||||
|
|
@ -115,6 +118,3 @@ index ae5283b7a..b9fc96e94 100644
|
|||
AC_DEFINE(HAVE_ACOSF)
|
||||
AC_DEFINE(HAVE_ASINF)
|
||||
AC_DEFINE(HAVE_ATAN2F)
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ It specifies which flags need to be passed to the linker, defines the
|
|||
__serenity__ macro, sets the correct underlying type of `size_t` and
|
||||
`ptrdiff_t`, and enables IFUNCs.
|
||||
|
||||
|
||||
## `0002-fixincludes-Skip-for-SerenityOS-targets.patch`
|
||||
|
||||
fixincludes: Skip for SerenityOS targets
|
||||
|
|
@ -27,6 +28,7 @@ libgcc: Build for SerenityOS
|
|||
This patch enables building gcc's own C runtime files, and sets up
|
||||
exception handling support.
|
||||
|
||||
|
||||
## `0004-libgcc-Do-not-link-libgcc_s-to-LibC.patch`
|
||||
|
||||
libgcc: Do not link libgcc_s to LibC
|
||||
|
|
@ -34,6 +36,7 @@ libgcc: Do not link libgcc_s to LibC
|
|||
The toolchain is built before LibC, so linking to the C runtime library
|
||||
would fail.
|
||||
|
||||
|
||||
## `0005-i386-Disable-math-errno-for-SerenityOS.patch`
|
||||
|
||||
i386: Disable math errno for SerenityOS
|
||||
|
|
@ -51,3 +54,4 @@ we have to manually tell libstdc++ about what our LibC supports.
|
|||
|
||||
In most places, we take the Newlib code paths.
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue