-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
193 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
patches/0001-Revert-GCC-change-about-turning-Wimplicit-function-d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| From 9088a8ce453a6b66d51b87d096bf9cf15042794d Mon Sep 17 00:00:00 2001 | ||
| From: Kartatz <[email protected]> | ||
| Date: Sun, 11 Aug 2024 22:06:07 +0200 | ||
| Subject: [PATCH] Revert GCC change about turning -Wimplicit-function-declaration into errors | ||
|
|
||
| Unfortunately, the new behavior breaks the compilation of some GCC dependencies and even GCC itself when building for very old targets. | ||
|
|
||
| This is due to these platforms lacking support for some required standard library functions and APIs: Until GCC 13, the compiler always fell back to a built-in alternative in case one of those functions was missing (see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html). The compiler, however, used to just issue an "implicit function declaration" warning for the usage of those builtins. Since this warning is now treated as an error, this simply made the compilation fail. | ||
| --- | ||
| gcc/c/c-decl.cc | 10 +++++----- | ||
| 1 file changed, 5 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc | ||
| index 0e52f2176..dde2b207c 100644 | ||
| --- a/gcc/c/c-decl.cc | ||
| +++ b/gcc/c/c-decl.cc | ||
| @@ -3566,7 +3566,7 @@ pushdecl (tree x) | ||
| or NULL_TREE. */ | ||
|
|
||
| static void | ||
| -implicit_decl_permerror (location_t loc, tree id, tree olddecl) | ||
| +implicit_decl_warning (location_t loc, tree id, tree olddecl) | ||
| { | ||
| if (!warn_implicit_function_declaration) | ||
| return; | ||
| @@ -3583,13 +3583,13 @@ implicit_decl_permerror (location_t loc, tree id, tree olddecl) | ||
| { | ||
| gcc_rich_location richloc (loc); | ||
| richloc.add_fixit_replace (suggestion); | ||
| - warned = permerror_opt (&richloc, OPT_Wimplicit_function_declaration, | ||
| + warned = pedwarn (&richloc, OPT_Wimplicit_function_declaration, | ||
| "implicit declaration of function %qE;" | ||
| " did you mean %qs?", | ||
| id, suggestion); | ||
| } | ||
| else | ||
| - warned = permerror_opt (loc, OPT_Wimplicit_function_declaration, | ||
| + warned = pedwarn (loc, OPT_Wimplicit_function_declaration, | ||
| "implicit declaration of function %qE", id); | ||
| } | ||
| else if (const char *suggestion = hint.suggestion ()) | ||
| @@ -3880,7 +3880,7 @@ implicitly_declare (location_t loc, tree functionid) | ||
| then recycle the old declaration but with the new type. */ | ||
| if (!C_DECL_IMPLICIT (decl)) | ||
| { | ||
| - implicit_decl_permerror (loc, functionid, decl); | ||
| + implicit_decl_warning (loc, functionid, decl); | ||
| C_DECL_IMPLICIT (decl) = 1; | ||
| } | ||
| if (fndecl_built_in_p (decl)) | ||
| @@ -3933,7 +3933,7 @@ implicitly_declare (location_t loc, tree functionid) | ||
| DECL_EXTERNAL (decl) = 1; | ||
| TREE_PUBLIC (decl) = 1; | ||
| C_DECL_IMPLICIT (decl) = 1; | ||
| - implicit_decl_permerror (loc, functionid, 0); | ||
| + implicit_decl_warning (loc, functionid, 0); | ||
| asmspec_tree = maybe_apply_renaming_pragma (decl, /*asmname=*/NULL); | ||
| if (asmspec_tree) | ||
| set_user_assembler_name (decl, TREE_STRING_POINTER (asmspec_tree)); | ||
| -- | ||
| 2.36.6 | ||
|
|
77 changes: 77 additions & 0 deletions
77
patches/0001-Revert-gold-Use-char16_t-char32_t-instead-of-uint16_.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| From c5fcba3bc2b47e1061e066deac04efbbdb53362d Mon Sep 17 00:00:00 2001 | ||
| From: Kartatz <[email protected]> | ||
| Date: Wed, 8 May 2024 07:04:54 +0200 | ||
| Subject: [PATCH] Revert "gold: Use char16_t, char32_t instead of uint16_t, | ||
| uint32_t as character types" | ||
|
|
||
| This reverts commit 5e9091dab8858b25210a91d22fbbbfdee9c969ad. | ||
| --- | ||
| diff --git a/gold/merge.cc b/gold/merge.cc | ||
| index ca15149c767..55de3013a1b 100644 | ||
| --- a/gold/merge.cc | ||
| +++ b/gold/merge.cc | ||
| @@ -665,10 +665,10 @@ template | ||
| class Output_merge_string<char>; | ||
|
|
||
| template | ||
| -class Output_merge_string<char16_t>; | ||
| +class Output_merge_string<uint16_t>; | ||
|
|
||
| template | ||
| -class Output_merge_string<char32_t>; | ||
| +class Output_merge_string<uint32_t>; | ||
|
|
||
| #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) | ||
| template | ||
| diff --git a/gold/output.cc b/gold/output.cc | ||
| index ead67f20363..3375d322506 100644 | ||
| --- a/gold/output.cc | ||
| +++ b/gold/output.cc | ||
| @@ -29,7 +29,6 @@ | ||
| #include <unistd.h> | ||
| #include <sys/stat.h> | ||
| #include <algorithm> | ||
| -#include <uchar.h> | ||
|
|
||
| #ifdef HAVE_SYS_MMAN_H | ||
| #include <sys/mman.h> | ||
| @@ -2707,10 +2706,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx, | ||
| pomb = new Output_merge_string<char>(addralign); | ||
| break; | ||
| case 2: | ||
| - pomb = new Output_merge_string<char16_t>(addralign); | ||
| + pomb = new Output_merge_string<uint16_t>(addralign); | ||
| break; | ||
| case 4: | ||
| - pomb = new Output_merge_string<char32_t>(addralign); | ||
| + pomb = new Output_merge_string<uint32_t>(addralign); | ||
| break; | ||
| default: | ||
| return false; | ||
| diff --git a/gold/stringpool.cc b/gold/stringpool.cc | ||
| index d8f38cfabc1..2e4a746d1a8 100644 | ||
| --- a/gold/stringpool.cc | ||
| +++ b/gold/stringpool.cc | ||
| @@ -25,7 +25,6 @@ | ||
| #include <cstring> | ||
| #include <algorithm> | ||
| #include <vector> | ||
| -#include <uchar.h> | ||
|
|
||
| #include "output.h" | ||
| #include "parameters.h" | ||
| @@ -528,9 +527,9 @@ template | ||
| class Stringpool_template<char>; | ||
|
|
||
| template | ||
| -class Stringpool_template<char16_t>; | ||
| +class Stringpool_template<uint16_t>; | ||
|
|
||
| template | ||
| -class Stringpool_template<char32_t>; | ||
| +class Stringpool_template<uint32_t>; | ||
|
|
||
| } // End namespace gold. | ||
| -- | ||
| 2.36.6 | ||
|
|
Submodule obggcc
updated
25 files