开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 7

_service:tar_scm:glibc.spec Changed

@@ -65,7 +65,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.36
-Release: 	16
+Release: 	18
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -113,7 +113,8 @@
 Patch9013: x86-use-total-l3cache-for-non_temporal_threshold.patch
 Patch9014: strcmp-delete-align-for-loop_aligned.patch
 Patch9015: add-pthread_cond_clockwait-GLIBC_2_28.patch
-Patch9016: add-GB18030-2022-charmap.patch
+Patch9016: add-GB18030-2022-charmap-BZ-30243.patch
+Patch9017: 0001-Optimizing-__random-for-single-threaded-scenarios.patch
 
 Provides: ldconfig rtld(GNU_HASH) bundled(gnulib)
 
@@ -1273,6 +1274,12 @@
 %endif
 
 %changelog
+* Tue Jul 11 2023 jiangyingxin<jiangyingxin1@huawei.com> - 2.36-18
+- Optimizing __random for single-threaded scenarios
+
+* Tue Jul 11 2023 lijianglin<lijianglin2@huawei.com> - 2.36-17
+- add the test of the entire GB18030 charmap
+
 * Mon Jun 5 2023 li-miaomiao_zhr <mmlidc@isoftstone.com> - 2.36-16
 - processing of annotated patch files in spec files

_service:tar_scm:0001-Optimizing-__random-for-single-threaded-scenarios.patch Added

@@ -0,0 +1,44 @@
+From f54e1ddea12343991b402abf28be2b94ffbac2c5 Mon Sep 17 00:00:00 2001
+From: Tian Tao <tiantao6@hisilicon.com>
+Date: Tue, 11 Jul 2023 08:42:56 +0800
+Subject: PATCH Optimizing __random for single-threaded scenarios
+
+The __random function does not need to be locked by __libc_lock_lock and
+unlocked by __libc_lock_unlock in a single-threaded scenario, so we can
+remove these locks in a single-threaded scenario to improve performance.
+
+Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
+---
+ stdlib/random.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/stdlib/random.c b/stdlib/random.c
+index 62f22fac8d..9035df8d18 100644
+--- a/stdlib/random.c
++++ b/stdlib/random.c
+@@ -288,11 +288,19 @@ __random (void)
+ {
+   int32_t retval;
+ 
+-  __libc_lock_lock (lock);
++  if (__libc_single_threaded) {
+ 
+-  (void) __random_r (&unsafe_state, &retval);
++	(void) __random_r (&unsafe_state, &retval);
+ 
+-  __libc_lock_unlock (lock);
++  } else {
++
++	 __libc_lock_lock (lock);
++
++	(void) __random_r (&unsafe_state, &retval);
++
++	__libc_lock_unlock (lock);
++
++  }
+ 
+   return retval;
+ }
+-- 
+2.33.0
+

_service:tar_scm:add-GB18030-2022-charmap-BZ-30243.patch Added

@@ -0,0 +1,853 @@
+From 1dc4a7192a27142bf3b916287c9cd37a361784f5 Mon Sep 17 00:00:00 2001
+From: lijianglin <lijianglin2@huawei.com>
+Date: Thu, 15 Jun 2023 16:50:13 +0800
+Subject: PATCH v3  add GB18030-2022 charmap and test the entire GB18030 charmap BZ #30243
+
+support GB18030-2022 after add and change some transcoding relationship
+of GB18030-2022.Details are as follows:
+add 25 transcoding relationship
+  UE81E 0x82359037
+  UE826 0x82359038
+  UE82B 0x82359039
+  UE82C 0x82359130
+  UE832 0x82359131
+  UE843 0x82359132
+  UE854 0x82359133
+  UE864 0x82359134
+  UE78D 0x84318236
+  UE78F 0x84318237
+  UE78E 0x84318238
+  UE790 0x84318239
+  UE791 0x84318330
+  UE792 0x84318331
+  UE793 0x84318332
+  UE794 0x84318333
+  UE795 0x84318334
+  UE796 0x84318335
+  UE816 0xfe51
+  UE817 0xfe52
+  UE818 0xfe53
+  UE831 0xfe6c
+  UE83B 0xfe76
+  UE855 0xfe91
+change 6 transcoding relationship
+  U20087 0x95329031
+  U20089 0x95329033
+  U200CC 0x95329730
+  U215D7 0x9536b937
+  U2298F 0x9630ba35
+  U241FE 0x9635b630
+Test the entire GB18030 charmap, not only the Unicode BMP part.
+
+Co-authored-by: yangyanchao <yangyanchao6@huawei.com>
+Co-authored-by: liqingqing <liqingqing3@huawei.com>
+Co-authored-by: Bruno Haible <bruno@clisp.org>
+Reviewed-by: Andreas Schwab <schwab@suse.de>
+---
+ iconvdata/gb18030.c         | 423 +++++++++++++++++++-----------------
+ iconvdata/tst-table-from.c  |   5 +-
+ iconvdata/tst-table-to.c    |  12 +-
+ iconvdata/tst-table.sh      |  50 +++--
+ localedata/charmaps/GB18030 |  91 +++-----
+ 5 files changed, 292 insertions(+), 289 deletions(-)
+
+diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
+index 0b03b9bb..ca383dc0 100644
+--- a/iconvdata/gb18030.c
++++ b/iconvdata/gb18030.c
+@@ -6020,49 +6020,50 @@ static const uint16_t __twobyte_to_ucs =
+   0x5dc2 = 0xfa0e, 0x5dc3 = 0xfa0f, 0x5dc4 = 0xfa11, 0x5dc5 = 0xfa13,
+   0x5dc6 = 0xfa14, 0x5dc7 = 0xfa18, 0x5dc8 = 0xfa1f, 0x5dc9 = 0xfa20,
+   0x5dca = 0xfa21, 0x5dcb = 0xfa23, 0x5dcc = 0xfa24, 0x5dcd = 0xfa27,
+-  0x5dce = 0xfa28, 0x5dcf = 0xfa29, 0x5dd0 = 0x2e81, 0x5dd4 = 0x2e84,
+-  0x5dd5 = 0x3473, 0x5dd6 = 0x3447, 0x5dd7 = 0x2e88, 0x5dd8 = 0x2e8b,
+-  0x5dd9 = 0x9fb4, 0x5dda = 0x359e, 0x5ddb = 0x361a, 0x5ddc = 0x360e,
+-  0x5ddd = 0x2e8c, 0x5dde = 0x2e97, 0x5ddf = 0x396e, 0x5de0 = 0x3918,
+-  0x5de1 = 0x9fb5, 0x5de2 = 0x39cf, 0x5de3 = 0x39df, 0x5de4 = 0x3a73,
+-  0x5de5 = 0x39d0, 0x5de6 = 0x9fb6, 0x5de7 = 0x9fb7, 0x5de8 = 0x3b4e,
+-  0x5de9 = 0x3c6e, 0x5dea = 0x3ce0, 0x5deb = 0x2ea7, 0x5ded = 0x9fb8,
++  0x5dce = 0xfa28, 0x5dcf = 0xfa29, 0x5dd0 = 0x2e81, 0x5dd1 = 0xe816,
++  0x5dd2 = 0xe817, 0x5dd3 = 0xe818, 0x5dd4 = 0x2e84, 0x5dd5 = 0x3473,
++  0x5dd6 = 0x3447, 0x5dd7 = 0x2e88, 0x5dd8 = 0x2e8b, 0x5dd9 = 0x9fb4,
++  0x5dda = 0x359e, 0x5ddb = 0x361a, 0x5ddc = 0x360e, 0x5ddd = 0x2e8c,
++  0x5dde = 0x2e97, 0x5ddf = 0x396e, 0x5de0 = 0x3918, 0x5de1 = 0x9fb5,
++  0x5de2 = 0x39cf, 0x5de3 = 0x39df, 0x5de4 = 0x3a73, 0x5de5 = 0x39d0,
++  0x5de6 = 0x9fb6, 0x5de7 = 0x9fb7, 0x5de8 = 0x3b4e, 0x5de9 = 0x3c6e,
++  0x5dea = 0x3ce0, 0x5deb = 0x2ea7, 0x5dec = 0xe831, 0x5ded = 0x9fb8,
+   0x5dee = 0x2eaa, 0x5def = 0x4056, 0x5df0 = 0x415f, 0x5df1 = 0x2eae,
+   0x5df2 = 0x4337, 0x5df3 = 0x2eb3, 0x5df4 = 0x2eb6, 0x5df5 = 0x2eb7,
+-  0x5df7 = 0x43b1, 0x5df8 = 0x43ac, 0x5df9 = 0x2ebb, 0x5dfa = 0x43dd,
+-  0x5dfb = 0x44d6, 0x5dfc = 0x4661, 0x5dfd = 0x464c, 0x5dfe = 0x9fb9,
+-  0x5e00 = 0x4723, 0x5e01 = 0x4729, 0x5e02 = 0x477c, 0x5e03 = 0x478d,
+-  0x5e04 = 0x2eca, 0x5e05 = 0x4947, 0x5e06 = 0x497a, 0x5e07 = 0x497d,
+-  0x5e08 = 0x4982, 0x5e09 = 0x4983, 0x5e0a = 0x4985, 0x5e0b = 0x4986,
+-  0x5e0c = 0x499f, 0x5e0d = 0x499b, 0x5e0e = 0x49b7, 0x5e0f = 0x49b6,
+-  0x5e10 = 0x9fba, 0x5e12 = 0x4ca3, 0x5e13 = 0x4c9f, 0x5e14 = 0x4ca0,
+-  0x5e15 = 0x4ca1, 0x5e16 = 0x4c77, 0x5e17 = 0x4ca2, 0x5e18 = 0x4d13,
+-  0x5e19 = 0x4d14, 0x5e1a = 0x4d15, 0x5e1b = 0x4d16, 0x5e1c = 0x4d17,
+-  0x5e1d = 0x4d18, 0x5e1e = 0x4d19, 0x5e1f = 0x4dae, 0x5e20 = 0x9fbb,
+-  0x5e21 = 0xe468, 0x5e22 = 0xe469, 0x5e23 = 0xe46a, 0x5e24 = 0xe46b,
+-  0x5e25 = 0xe46c, 0x5e26 = 0xe46d, 0x5e27 = 0xe46e, 0x5e28 = 0xe46f,
+-  0x5e29 = 0xe470, 0x5e2a = 0xe471, 0x5e2b = 0xe472, 0x5e2c = 0xe473,
+-  0x5e2d = 0xe474, 0x5e2e = 0xe475, 0x5e2f = 0xe476, 0x5e30 = 0xe477,
+-  0x5e31 = 0xe478, 0x5e32 = 0xe479, 0x5e33 = 0xe47a, 0x5e34 = 0xe47b,
+-  0x5e35 = 0xe47c, 0x5e36 = 0xe47d, 0x5e37 = 0xe47e, 0x5e38 = 0xe47f,
+-  0x5e39 = 0xe480, 0x5e3a = 0xe481, 0x5e3b = 0xe482, 0x5e3c = 0xe483,
+-  0x5e3d = 0xe484, 0x5e3e = 0xe485, 0x5e3f = 0xe486, 0x5e40 = 0xe487,
+-  0x5e41 = 0xe488, 0x5e42 = 0xe489, 0x5e43 = 0xe48a, 0x5e44 = 0xe48b,
+-  0x5e45 = 0xe48c, 0x5e46 = 0xe48d, 0x5e47 = 0xe48e, 0x5e48 = 0xe48f,
+-  0x5e49 = 0xe490, 0x5e4a = 0xe491, 0x5e4b = 0xe492, 0x5e4c = 0xe493,
+-  0x5e4d = 0xe494, 0x5e4e = 0xe495, 0x5e4f = 0xe496, 0x5e50 = 0xe497,
+-  0x5e51 = 0xe498, 0x5e52 = 0xe499, 0x5e53 = 0xe49a, 0x5e54 = 0xe49b,
+-  0x5e55 = 0xe49c, 0x5e56 = 0xe49d, 0x5e57 = 0xe49e, 0x5e58 = 0xe49f,
+-  0x5e59 = 0xe4a0, 0x5e5a = 0xe4a1, 0x5e5b = 0xe4a2, 0x5e5c = 0xe4a3,
+-  0x5e5d = 0xe4a4, 0x5e5e = 0xe4a5, 0x5e5f = 0xe4a6, 0x5e60 = 0xe4a7,
+-  0x5e61 = 0xe4a8, 0x5e62 = 0xe4a9, 0x5e63 = 0xe4aa, 0x5e64 = 0xe4ab,
+-  0x5e65 = 0xe4ac, 0x5e66 = 0xe4ad, 0x5e67 = 0xe4ae, 0x5e68 = 0xe4af,
+-  0x5e69 = 0xe4b0, 0x5e6a = 0xe4b1, 0x5e6b = 0xe4b2, 0x5e6c = 0xe4b3,
+-  0x5e6d = 0xe4b4, 0x5e6e = 0xe4b5, 0x5e6f = 0xe4b6, 0x5e70 = 0xe4b7,
+-  0x5e71 = 0xe4b8, 0x5e72 = 0xe4b9, 0x5e73 = 0xe4ba, 0x5e74 = 0xe4bb,
+-  0x5e75 = 0xe4bc, 0x5e76 = 0xe4bd, 0x5e77 = 0xe4be, 0x5e78 = 0xe4bf,
+-  0x5e79 = 0xe4c0, 0x5e7a = 0xe4c1, 0x5e7b = 0xe4c2, 0x5e7c = 0xe4c3,
+-  0x5e7d = 0xe4c4, 0x5e7e = 0xe4c5,
++  0x5df6 = 0xe83b, 0x5df7 = 0x43b1, 0x5df8 = 0x43ac, 0x5df9 = 0x2ebb,
++  0x5dfa = 0x43dd, 0x5dfb = 0x44d6, 0x5dfc = 0x4661, 0x5dfd = 0x464c,
++  0x5dfe = 0x9fb9, 0x5e00 = 0x4723, 0x5e01 = 0x4729, 0x5e02 = 0x477c,
++  0x5e03 = 0x478d, 0x5e04 = 0x2eca, 0x5e05 = 0x4947, 0x5e06 = 0x497a,
++  0x5e07 = 0x497d, 0x5e08 = 0x4982, 0x5e09 = 0x4983, 0x5e0a = 0x4985,
++  0x5e0b = 0x4986, 0x5e0c = 0x499f, 0x5e0d = 0x499b, 0x5e0e = 0x49b7,
++  0x5e0f = 0x49b6, 0x5e10 = 0x9fba, 0x5e11 = 0xe855, 0x5e12 = 0x4ca3,
++  0x5e13 = 0x4c9f, 0x5e14 = 0x4ca0, 0x5e15 = 0x4ca1, 0x5e16 = 0x4c77,
++  0x5e17 = 0x4ca2, 0x5e18 = 0x4d13, 0x5e19 = 0x4d14, 0x5e1a = 0x4d15,
++  0x5e1b = 0x4d16, 0x5e1c = 0x4d17, 0x5e1d = 0x4d18, 0x5e1e = 0x4d19,
++  0x5e1f = 0x4dae, 0x5e20 = 0x9fbb, 0x5e21 = 0xe468, 0x5e22 = 0xe469,
++  0x5e23 = 0xe46a, 0x5e24 = 0xe46b, 0x5e25 = 0xe46c, 0x5e26 = 0xe46d,
++  0x5e27 = 0xe46e, 0x5e28 = 0xe46f, 0x5e29 = 0xe470, 0x5e2a = 0xe471,
++  0x5e2b = 0xe472, 0x5e2c = 0xe473, 0x5e2d = 0xe474, 0x5e2e = 0xe475,
++  0x5e2f = 0xe476, 0x5e30 = 0xe477, 0x5e31 = 0xe478, 0x5e32 = 0xe479,
++  0x5e33 = 0xe47a, 0x5e34 = 0xe47b, 0x5e35 = 0xe47c, 0x5e36 = 0xe47d,
++  0x5e37 = 0xe47e, 0x5e38 = 0xe47f, 0x5e39 = 0xe480, 0x5e3a = 0xe481,
++  0x5e3b = 0xe482, 0x5e3c = 0xe483, 0x5e3d = 0xe484, 0x5e3e = 0xe485,
++  0x5e3f = 0xe486, 0x5e40 = 0xe487, 0x5e41 = 0xe488, 0x5e42 = 0xe489,
++  0x5e43 = 0xe48a, 0x5e44 = 0xe48b, 0x5e45 = 0xe48c, 0x5e46 = 0xe48d,
++  0x5e47 = 0xe48e, 0x5e48 = 0xe48f, 0x5e49 = 0xe490, 0x5e4a = 0xe491,
++  0x5e4b = 0xe492, 0x5e4c = 0xe493, 0x5e4d = 0xe494, 0x5e4e = 0xe495,
++  0x5e4f = 0xe496, 0x5e50 = 0xe497, 0x5e51 = 0xe498, 0x5e52 = 0xe499,
++  0x5e53 = 0xe49a, 0x5e54 = 0xe49b, 0x5e55 = 0xe49c, 0x5e56 = 0xe49d,
++  0x5e57 = 0xe49e, 0x5e58 = 0xe49f, 0x5e59 = 0xe4a0, 0x5e5a = 0xe4a1,
++  0x5e5b = 0xe4a2, 0x5e5c = 0xe4a3, 0x5e5d = 0xe4a4, 0x5e5e = 0xe4a5,
++  0x5e5f = 0xe4a6, 0x5e60 = 0xe4a7, 0x5e61 = 0xe4a8, 0x5e62 = 0xe4a9,
++  0x5e63 = 0xe4aa, 0x5e64 = 0xe4ab, 0x5e65 = 0xe4ac, 0x5e66 = 0xe4ad,
++  0x5e67 = 0xe4ae, 0x5e68 = 0xe4af, 0x5e69 = 0xe4b0, 0x5e6a = 0xe4b1,
++  0x5e6b = 0xe4b2, 0x5e6c = 0xe4b3, 0x5e6d = 0xe4b4, 0x5e6e = 0xe4b5,
++  0x5e6f = 0xe4b6, 0x5e70 = 0xe4b7, 0x5e71 = 0xe4b8, 0x5e72 = 0xe4b9,
++  0x5e73 = 0xe4ba, 0x5e74 = 0xe4bb, 0x5e75 = 0xe4bc, 0x5e76 = 0xe4bd,
++  0x5e77 = 0xe4be, 0x5e78 = 0xe4bf, 0x5e79 = 0xe4c0, 0x5e7a = 0xe4c1,
++  0x5e7b = 0xe4c2, 0x5e7c = 0xe4c3, 0x5e7d = 0xe4c4, 0x5e7e = 0xe4c5,
+ };
+ 
+ /* Table for GB18030 -> UCS-4, containing the four-byte characters only,
+@@ -8691,7 +8692,9 @@ static const uint16_t __fourbyte_to_ucs0x99e2 - 6637 - 2110 - 14404 - 4295 =
+   0x2838 = 0x9fa6, 0x2839 = 0x9fa7, 0x283a = 0x9fa8, 0x283b = 0x9fa9,
+   0x283c = 0x9faa, 0x283d = 0x9fab, 0x283e = 0x9fac, 0x283f = 0x9fad,
+   0x2840 = 0x9fae, 0x2841 = 0x9faf, 0x2842 = 0x9fb0, 0x2843 = 0x9fb1,
+-  0x2844 = 0x9fb2, 0x2845 = 0x9fb3, 0x284e = 0xe76c, 0x284f = 0xe7c8,
++  0x2844 = 0x9fb2, 0x2845 = 0x9fb3, 0x2846 = 0xe81e, 0x2847 = 0xe826,
++  0x2848 = 0xe82b, 0x2849 = 0xe82c, 0x284a = 0xe832, 0x284b = 0xe843,
++  0x284c = 0xe854, 0x284d = 0xe864, 0x284e = 0xe76c, 0x284f = 0xe7c8,
+   0x2850 = 0xe7e7, 0x2851 = 0xe7e8, 0x2852 = 0xe7e9, 0x2853 = 0xe7ea,
+   0x2854 = 0xe7eb, 0x2855 = 0xe7ec, 0x2856 = 0xe7ed, 0x2857 = 0xe7ee,
+   0x2858 = 0xe7ef, 0x2859 = 0xe7f0, 0x285a = 0xe7f1, 0x285b = 0xe7f2,
+@@ -9019,84 +9022,86 @@ static const uint16_t __fourbyte_to_ucs0x99e2 - 6637 - 2110 - 14404 - 4295 =
+   0x2d60 = 0xfe02, 0x2d61 = 0xfe03, 0x2d62 = 0xfe04, 0x2d63 = 0xfe05,
+   0x2d64 = 0xfe06, 0x2d65 = 0xfe07, 0x2d66 = 0xfe08, 0x2d67 = 0xfe09,
+   0x2d68 = 0xfe0a, 0x2d69 = 0xfe0b, 0x2d6a = 0xfe0c, 0x2d6b = 0xfe0d,
+-  0x2d6c = 0xfe0e, 0x2d6d = 0xfe0f, 0x2d78 = 0xfe1a, 0x2d79 = 0xfe1b,
+-  0x2d7a = 0xfe1c, 0x2d7b = 0xfe1d, 0x2d7c = 0xfe1e, 0x2d7d = 0xfe1f,
+-  0x2d7e = 0xfe20, 0x2d7f = 0xfe21, 0x2d80 = 0xfe22, 0x2d81 = 0xfe23,
+-  0x2d82 = 0xfe24, 0x2d83 = 0xfe25, 0x2d84 = 0xfe26, 0x2d85 = 0xfe27,
+-  0x2d86 = 0xfe28, 0x2d87 = 0xfe29, 0x2d88 = 0xfe2a, 0x2d89 = 0xfe2b,
+-  0x2d8a = 0xfe2c, 0x2d8b = 0xfe2d, 0x2d8c = 0xfe2e, 0x2d8d = 0xfe2f,
+-  0x2d8e = 0xfe32, 0x2d8f = 0xfe45, 0x2d90 = 0xfe46, 0x2d91 = 0xfe47,
+-  0x2d92 = 0xfe48, 0x2d93 = 0xfe53, 0x2d94 = 0xfe58, 0x2d95 = 0xfe67,
+-  0x2d96 = 0xfe6c, 0x2d97 = 0xfe6d, 0x2d98 = 0xfe6e, 0x2d99 = 0xfe6f,
+-  0x2d9a = 0xfe70, 0x2d9b = 0xfe71, 0x2d9c = 0xfe72, 0x2d9d = 0xfe73,
+-  0x2d9e = 0xfe74, 0x2d9f = 0xfe75, 0x2da0 = 0xfe76, 0x2da1 = 0xfe77,
+-  0x2da2 = 0xfe78, 0x2da3 = 0xfe79, 0x2da4 = 0xfe7a, 0x2da5 = 0xfe7b,
+-  0x2da6 = 0xfe7c, 0x2da7 = 0xfe7d, 0x2da8 = 0xfe7e, 0x2da9 = 0xfe7f,
+-  0x2daa = 0xfe80, 0x2dab = 0xfe81, 0x2dac = 0xfe82, 0x2dad = 0xfe83,
+-  0x2dae = 0xfe84, 0x2daf = 0xfe85, 0x2db0 = 0xfe86, 0x2db1 = 0xfe87,
+-  0x2db2 = 0xfe88, 0x2db3 = 0xfe89, 0x2db4 = 0xfe8a, 0x2db5 = 0xfe8b,
+-  0x2db6 = 0xfe8c, 0x2db7 = 0xfe8d, 0x2db8 = 0xfe8e, 0x2db9 = 0xfe8f,
+-  0x2dba = 0xfe90, 0x2dbb = 0xfe91, 0x2dbc = 0xfe92, 0x2dbd = 0xfe93,
+-  0x2dbe = 0xfe94, 0x2dbf = 0xfe95, 0x2dc0 = 0xfe96, 0x2dc1 = 0xfe97,
+-  0x2dc2 = 0xfe98, 0x2dc3 = 0xfe99, 0x2dc4 = 0xfe9a, 0x2dc5 = 0xfe9b,
+-  0x2dc6 = 0xfe9c, 0x2dc7 = 0xfe9d, 0x2dc8 = 0xfe9e, 0x2dc9 = 0xfe9f,
+-  0x2dca = 0xfea0, 0x2dcb = 0xfea1, 0x2dcc = 0xfea2, 0x2dcd = 0xfea3,
+-  0x2dce = 0xfea4, 0x2dcf = 0xfea5, 0x2dd0 = 0xfea6, 0x2dd1 = 0xfea7,
+-  0x2dd2 = 0xfea8, 0x2dd3 = 0xfea9, 0x2dd4 = 0xfeaa, 0x2dd5 = 0xfeab,
+-  0x2dd6 = 0xfeac, 0x2dd7 = 0xfead, 0x2dd8 = 0xfeae, 0x2dd9 = 0xfeaf,
+-  0x2dda = 0xfeb0, 0x2ddb = 0xfeb1, 0x2ddc = 0xfeb2, 0x2ddd = 0xfeb3,
+-  0x2dde = 0xfeb4, 0x2ddf = 0xfeb5, 0x2de0 = 0xfeb6, 0x2de1 = 0xfeb7,
+-  0x2de2 = 0xfeb8, 0x2de3 = 0xfeb9, 0x2de4 = 0xfeba, 0x2de5 = 0xfebb,
+-  0x2de6 = 0xfebc, 0x2de7 = 0xfebd, 0x2de8 = 0xfebe, 0x2de9 = 0xfebf,
+-  0x2dea = 0xfec0, 0x2deb = 0xfec1, 0x2dec = 0xfec2, 0x2ded = 0xfec3,
+-  0x2dee = 0xfec4, 0x2def = 0xfec5, 0x2df0 = 0xfec6, 0x2df1 = 0xfec7,
+-  0x2df2 = 0xfec8, 0x2df3 = 0xfec9, 0x2df4 = 0xfeca, 0x2df5 = 0xfecb,
+-  0x2df6 = 0xfecc, 0x2df7 = 0xfecd, 0x2df8 = 0xfece, 0x2df9 = 0xfecf,
+-  0x2dfa = 0xfed0, 0x2dfb = 0xfed1, 0x2dfc = 0xfed2, 0x2dfd = 0xfed3,
+-  0x2dfe = 0xfed4, 0x2dff = 0xfed5, 0x2e00 = 0xfed6, 0x2e01 = 0xfed7,

_service:tar_scm:add-GB18030-2022-charmap.patch Deleted

@@ -1,359 +0,0 @@
-From f2774810fd9cd75b5216743a26965f9448a8fb72 Mon Sep 17 00:00:00 2001
-From: lijianglin <lijianglin2@huawei.com>
-Date: Mon, 8 May 2023 14:39:03 +0800
-Subject: PATCH add GB18030-2022 charmap
-
-achieve GB18030-2022 level 2 after add and change some transcoding
-relationship of GB18030-2022.Details are as follows:
-add 25 transcoding relationship
-  UE81E 0x82359037
-  UE826 0x82359038
-  UE82B 0x82359039
-  UE82C 0x82359130
-  UE832 0x82359131
-  UE843 0x82359132
-  UE854 0x82359133
-  UE864 0x82359134
-  UE78D 0x84318236
-  UE78F 0x84318237
-  UE78E 0x84318238
-  UE790 0x84318239
-  UE791 0x84318330
-  UE792 0x84318331
-  UE793 0x84318332
-  UE794 0x84318333
-  UE795 0x84318334
-  UE796 0x84318335
-  UE816 0xfe51
-  UE817 0xfe52
-  UE818 0xfe53
-  UE831 0xfe6c
-  UE83B 0xfe76
-  UE855 0xfe91
-change 6 transcoding relationship
-  U20087 0x95329031
-  U20089 0x95329033
-  U200CC 0x95329730
-  U215D7 0x9536b937
-  U2298F 0x9630ba35
-  U241FE 0x9635b630
----
- iconvdata/gb18030.c         | 52 +++++++++++++++++++++++----
- localedata/charmaps/GB18030 | 70 ++++++++++++++++---------------------
- 2 files changed, 76 insertions(+), 46 deletions(-)
-
-diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
-index 0b03b9bb..7dca9b09 100644
---- a/iconvdata/gb18030.c
-+++ b/iconvdata/gb18030.c
-@@ -6021,14 +6021,17 @@ static const uint16_t __twobyte_to_ucs =
-   0x5dc6 = 0xfa14, 0x5dc7 = 0xfa18, 0x5dc8 = 0xfa1f, 0x5dc9 = 0xfa20,
-   0x5dca = 0xfa21, 0x5dcb = 0xfa23, 0x5dcc = 0xfa24, 0x5dcd = 0xfa27,
-   0x5dce = 0xfa28, 0x5dcf = 0xfa29, 0x5dd0 = 0x2e81, 0x5dd4 = 0x2e84,
-+  0x5dd1 = 0xe816, 0x5dd2 = 0xe817, 0x5dd3 = 0xe818,
-   0x5dd5 = 0x3473, 0x5dd6 = 0x3447, 0x5dd7 = 0x2e88, 0x5dd8 = 0x2e8b,
-   0x5dd9 = 0x9fb4, 0x5dda = 0x359e, 0x5ddb = 0x361a, 0x5ddc = 0x360e,
-   0x5ddd = 0x2e8c, 0x5dde = 0x2e97, 0x5ddf = 0x396e, 0x5de0 = 0x3918,
-   0x5de1 = 0x9fb5, 0x5de2 = 0x39cf, 0x5de3 = 0x39df, 0x5de4 = 0x3a73,
-   0x5de5 = 0x39d0, 0x5de6 = 0x9fb6, 0x5de7 = 0x9fb7, 0x5de8 = 0x3b4e,
-   0x5de9 = 0x3c6e, 0x5dea = 0x3ce0, 0x5deb = 0x2ea7, 0x5ded = 0x9fb8,
-+  0x5dec = 0xe831,
-   0x5dee = 0x2eaa, 0x5def = 0x4056, 0x5df0 = 0x415f, 0x5df1 = 0x2eae,
-   0x5df2 = 0x4337, 0x5df3 = 0x2eb3, 0x5df4 = 0x2eb6, 0x5df5 = 0x2eb7,
-+  0x5df6 = 0xe83b,
-   0x5df7 = 0x43b1, 0x5df8 = 0x43ac, 0x5df9 = 0x2ebb, 0x5dfa = 0x43dd,
-   0x5dfb = 0x44d6, 0x5dfc = 0x4661, 0x5dfd = 0x464c, 0x5dfe = 0x9fb9,
-   0x5e00 = 0x4723, 0x5e01 = 0x4729, 0x5e02 = 0x477c, 0x5e03 = 0x478d,
-@@ -6036,6 +6039,7 @@ static const uint16_t __twobyte_to_ucs =
-   0x5e08 = 0x4982, 0x5e09 = 0x4983, 0x5e0a = 0x4985, 0x5e0b = 0x4986,
-   0x5e0c = 0x499f, 0x5e0d = 0x499b, 0x5e0e = 0x49b7, 0x5e0f = 0x49b6,
-   0x5e10 = 0x9fba, 0x5e12 = 0x4ca3, 0x5e13 = 0x4c9f, 0x5e14 = 0x4ca0,
-+  0x5e11 = 0xe855,
-   0x5e15 = 0x4ca1, 0x5e16 = 0x4c77, 0x5e17 = 0x4ca2, 0x5e18 = 0x4d13,
-   0x5e19 = 0x4d14, 0x5e1a = 0x4d15, 0x5e1b = 0x4d16, 0x5e1c = 0x4d17,
-   0x5e1d = 0x4d18, 0x5e1e = 0x4d19, 0x5e1f = 0x4dae, 0x5e20 = 0x9fbb,
-@@ -8692,6 +8696,8 @@ static const uint16_t __fourbyte_to_ucs0x99e2 - 6637 - 2110 - 14404 - 4295 =
-   0x283c = 0x9faa, 0x283d = 0x9fab, 0x283e = 0x9fac, 0x283f = 0x9fad,
-   0x2840 = 0x9fae, 0x2841 = 0x9faf, 0x2842 = 0x9fb0, 0x2843 = 0x9fb1,
-   0x2844 = 0x9fb2, 0x2845 = 0x9fb3, 0x284e = 0xe76c, 0x284f = 0xe7c8,
-+  0x2846 = 0xe81e, 0x2847 = 0xe826, 0x2848 = 0xe82b, 0x2849 = 0xe82c,
-+  0x284a = 0xe832, 0x284b = 0xe843, 0x284c = 0xe854, 0x284d = 0xe864,
-   0x2850 = 0xe7e7, 0x2851 = 0xe7e8, 0x2852 = 0xe7e9, 0x2853 = 0xe7ea,
-   0x2854 = 0xe7eb, 0x2855 = 0xe7ec, 0x2856 = 0xe7ed, 0x2857 = 0xe7ee,
-   0x2858 = 0xe7ef, 0x2859 = 0xe7f0, 0x285a = 0xe7f1, 0x285b = 0xe7f2,
-@@ -9020,6 +9026,9 @@ static const uint16_t __fourbyte_to_ucs0x99e2 - 6637 - 2110 - 14404 - 4295 =
-   0x2d64 = 0xfe06, 0x2d65 = 0xfe07, 0x2d66 = 0xfe08, 0x2d67 = 0xfe09,
-   0x2d68 = 0xfe0a, 0x2d69 = 0xfe0b, 0x2d6a = 0xfe0c, 0x2d6b = 0xfe0d,
-   0x2d6c = 0xfe0e, 0x2d6d = 0xfe0f, 0x2d78 = 0xfe1a, 0x2d79 = 0xfe1b,
-+  0x2d6e = 0xe78d, 0x2d6f = 0xe78f, 0x2d70 = 0xe78e, 0x2d71 = 0xe790,
-+  0x2d72 = 0xe791, 0x2d73 = 0xe792, 0x2d74 = 0xe793, 0x2d75 = 0xe794,
-+  0x2d76 = 0xe795, 0x2d77 = 0xe796,
-   0x2d7a = 0xfe1c, 0x2d7b = 0xfe1d, 0x2d7c = 0xfe1e, 0x2d7d = 0xfe1f,
-   0x2d7e = 0xfe20, 0x2d7f = 0xfe21, 0x2d80 = 0xfe22, 0x2d81 = 0xfe23,
-   0x2d82 = 0xfe24, 0x2d83 = 0xfe25, 0x2d84 = 0xfe26, 0x2d85 = 0xfe27,
-@@ -23449,6 +23458,10 @@ static const unsigned char __ucs_to_gb18030_tab22 =
-   0x0786 = "\xa6\xba", 0x0787 = "\xa6\xbb", 0x0788 = "\xa6\xbc",
-   0x0789 = "\xa6\xbd", 0x078a = "\xa6\xbe", 0x078b = "\xa6\xbf",
-   0x078c = "\xa6\xc0", 0x0797 = "\xa6\xf6", 0x0798 = "\xa6\xf7",
-+  0x078d = "\x7b\x84", 0x078e = "\x7b\x86", 0x078f = "\x7b\x85",
-+  0x0790 = "\x7b\x87", 0x0791 = "\x7b\x88", 0x0792 = "\x7b\x89",
-+  0x0793 = "\x7b\x8a", 0x0794 = "\x7b\x8b", 0x0795 = "\x7b\x8c",
-+  0x0796 = "\x7b\x8d",
-   0x0799 = "\xa6\xf8", 0x079a = "\xa6\xf9", 0x079b = "\xa6\xfa",
-   0x079c = "\xa6\xfb", 0x079d = "\xa6\xfc", 0x079e = "\xa6\xfd",
-   0x079f = "\xa6\xfe", 0x07a0 = "\xa7\xc2", 0x07a1 = "\xa7\xc3",
-@@ -23491,28 +23504,37 @@ static const unsigned char __ucs_to_gb18030_tab22 =
-   0x080e = "\xa9\xfd", 0x080f = "\xa9\xfe", 0x0810 = "\xd7\xfa",
-   0x0811 = "\xd7\xfb", 0x0812 = "\xd7\xfc", 0x0813 = "\xd7\xfd",
-   0x0814 = "\xd7\xfe", 0x0815 = "\x65\xac", 0x0819 = "\x65\xad",
-+  0x0816 = "\xfe\x51", 0x0817 = "\xfe\x52", 0x0818 = "\xfe\x53",
-   0x081a = "\x65\xae", 0x081b = "\x65\xaf", 0x081c = "\x65\xb0",
-   0x081d = "\x65\xb1", 0x081f = "\x65\xb2", 0x0820 = "\x65\xb3",
-+  0x081e = "\x2d\x51",
-   0x0821 = "\x65\xb4", 0x0822 = "\x65\xb5", 0x0823 = "\x65\xb6",
-   0x0824 = "\x65\xb7", 0x0825 = "\x65\xb8", 0x0827 = "\x65\xb9",
-+  0x0826 = "\x2d\x52",
-   0x0828 = "\x65\xba", 0x0829 = "\x65\xbb", 0x082a = "\x65\xbc",
-+  0x082b = "\x2d\x53", 0x082c = "\x2d\x54",
-   0x082d = "\x65\xbd", 0x082e = "\x65\xbe", 0x082f = "\x65\xbf",
-   0x0830 = "\x65\xc0", 0x0833 = "\x65\xc1", 0x0834 = "\x65\xc2",
-+  0x0831 = "\xfe\x6c", 0x0832 = "\x2d\x55",
-   0x0835 = "\x65\xc3", 0x0836 = "\x65\xc4", 0x0837 = "\x65\xc5",
-   0x0838 = "\x65\xc6", 0x0839 = "\x65\xc7", 0x083a = "\x65\xc8",
-+  0x083b = "\xfe\x76",
-   0x083c = "\x65\xc9", 0x083d = "\x65\xca", 0x083e = "\x65\xcb",
-   0x083f = "\x65\xcc", 0x0840 = "\x65\xcd", 0x0841 = "\x65\xce",
-   0x0842 = "\x65\xcf", 0x0844 = "\x65\xd0", 0x0845 = "\x65\xd1",
-+  0x0843 = "\x2d\x56",
-   0x0846 = "\x65\xd2", 0x0847 = "\x65\xd3", 0x0848 = "\x65\xd4",
-   0x0849 = "\x65\xd5", 0x084a = "\x65\xd6", 0x084b = "\x65\xd7",
-   0x084c = "\x65\xd8", 0x084d = "\x65\xd9", 0x084e = "\x65\xda",
-   0x084f = "\x65\xdb", 0x0850 = "\x65\xdc", 0x0851 = "\x65\xdd",
-   0x0852 = "\x65\xde", 0x0853 = "\x65\xdf", 0x0856 = "\x65\xe0",
-+  0x0854 = "\x2d\x57", 0x0855 = "\xfe\x91",
-   0x0857 = "\x65\xe1", 0x0858 = "\x65\xe2", 0x0859 = "\x65\xe3",
-   0x085a = "\x65\xe4", 0x085b = "\x65\xe5", 0x085c = "\x65\xe6",
-   0x085d = "\x65\xe7", 0x085e = "\x65\xe8", 0x085f = "\x65\xe9",
-   0x0860 = "\x65\xea", 0x0861 = "\x65\xeb", 0x0862 = "\x65\xec",
-   0x0863 = "\x65\xed", 0x0865 = "\xfd\x9c", 0x0866 = "\x76\xb5",
-+  0x0864 = "\x2d\x58",
-   0x0867 = "\x76\xb6", 0x0868 = "\x76\xb7", 0x0869 = "\x76\xb8",
-   0x086a = "\x76\xb9", 0x086b = "\x76\xba", 0x086c = "\x76\xbb",
-   0x086d = "\x76\xbc", 0x086e = "\x76\xbd", 0x086f = "\x76\xbe",
-@@ -24331,17 +24353,35 @@ static const unsigned char __ucs_to_gb18030_tab22 =
- 	    len = 4;							      \
- 	  }								      \
- 	else if (ch == 0x20087)						      \
--	  cp = (const unsigned char *) "\xfe\x51";			      \
-+	  {								      \
-+	    idx = 0x3E2CF;						      \
-+	    len = 4;							      \
-+	  }	                      \
- 	else if (ch == 0x20089)						      \
--	  cp = (const unsigned char *) "\xfe\x52";			      \
-+	  {								      \
-+	    idx = 0x3E2D1;						      \
-+	    len = 4;							      \
-+	  }	                       \
- 	else if (ch == 0x200CC)						      \
--	  cp = (const unsigned char *) "\xfe\x53";			      \
-+	  {								      \
-+	    idx = 0x3E314;						      \
-+	    len = 4;							      \
-+	  }	                        \
- 	else if (ch == 0x215d7)						      \
--	  cp = (const unsigned char *) "\xfe\x6c";			      \
-+	  {								      \
-+	    idx = 0x3F81F;						      \
-+	    len = 4;							      \
-+	  }	                        \
- 	else if (ch == 0x2298F)						      \
--	  cp = (const unsigned char *) "\xfe\x76";			      \
-+	  {								      \
-+	    idx = 0x40BD7;						      \
-+	    len = 4;							      \
-+	  }	                        \
- 	else if (ch == 0x241FE)						      \
--	  cp = (const unsigned char *) "\xfe\x91";			      \
-+	  {								      \
-+	    idx = 0x42446;						      \
-+	    len = 4;							      \
-+	  }	                        \
- 	else if (ch >= 0x10000 && ch <= 0x10FFFF)			      \
- 	  {								      \
- 	    idx = ch + 0x1E248;						      \
-diff --git a/localedata/charmaps/GB18030 b/localedata/charmaps/GB18030
-index ad6728c5..228e63f4 100644
---- a/localedata/charmaps/GB18030
-+++ b/localedata/charmaps/GB18030
-@@ -57249,17 +57249,16 @@ CHARMAP
- % The recommendation to use the non-PUA code points, where available,
- % is based on "CJKV Information Processing" 2nd Ed. by Dr. Ken Lunde.
- %
--% These 10 PUA mappings use equivalents from <UFE10> to <UFE19>.
--% <UE78D>     /xa6/xd9         <Private Use>
--% <UE78E>     /xa6/xda         <Private Use>
--% <UE78F>     /xa6/xdb         <Private Use>
--% <UE790>     /xa6/xdc         <Private Use>
--% <UE791>     /xa6/xdd         <Private Use>
--% <UE792>     /xa6/xde         <Private Use>