-
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
1 changed file
with
77 additions
and
0 deletions.
There are no files selected for viewing
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 <105828205+Kartatz@users.noreply.github.com> | ||
| 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 | ||
|
|