diff --git a/build/gcc10/build.sh b/build/gcc10/build.sh index 674a75b0a9..e5a361a0a9 100755 --- a/build/gcc10/build.sh +++ b/build/gcc10/build.sh @@ -21,7 +21,7 @@ PKG=developer/gcc10 PROG=gcc VER=10.5.0 -ILVER=il-1 +ILVER=il-2 SUMMARY="gcc $VER-$ILVER" DESC="The GNU Compiler Collection" diff --git a/build/gcc10/patches/0038-16768-kernel-printf-should-know-about-j-and-z-size-s.patch b/build/gcc10/patches/0038-16768-kernel-printf-should-know-about-j-and-z-size-s.patch new file mode 100644 index 0000000000..eda3e12e3b --- /dev/null +++ b/build/gcc10/patches/0038-16768-kernel-printf-should-know-about-j-and-z-size-s.patch @@ -0,0 +1,60 @@ +From 640cc111a1e8f2ea03f773ccf4619b66dddbb5e4 Mon Sep 17 00:00:00 2001 +From: Andy Fiddaman +Date: Tue, 15 Oct 2024 15:31:19 +0000 +Subject: 16768 kernel printf should know about %j and %z size + specifiers + +--- + gcc/config/sol2-c.c | 9 +++++---- + gcc/testsuite/gcc.dg/format/cmn-err-1.c | 4 ++++ + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c +index 5419e0436944..037baa604131 100644 +--- a/gcc/config/sol2-c.c ++++ b/gcc/config/sol2-c.c +@@ -37,6 +37,8 @@ static const format_length_info cmn_err_length_specs[] = + { + { "h", FMT_LEN_h, STD_C89, "hh", FMT_LEN_hh, STD_C99, 0 }, + { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C89, 0 }, ++ { "j", FMT_LEN_j, STD_C99, NO_FMT, 0 }, ++ { "z", FMT_LEN_z, STD_C99, NO_FMT, 0 }, + { NO_FMT, NO_FMT, 0 } + }; + +@@ -63,10 +65,9 @@ static const format_char_info bitfield_string_type = + static const format_char_info cmn_err_char_table[] = + { + /* none hh h l ll L z t j H D DD */ +- /* C89 conversion specifiers. */ +- { "dD", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, +- { "oOxX",0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, +- { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, ++ { "dD", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, BADLEN, T99_IM , BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, ++ { "oOxX",0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, BADLEN, T99_ST, BADLEN, T99_UIM, BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, ++ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, BADLEN, T99_ST, BADLEN, T99_UIM, BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL }, + { "c", 0, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-w", "", NULL }, + { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-w", "c", NULL }, + { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN , BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL }, +diff --git a/gcc/testsuite/gcc.dg/format/cmn-err-1.c b/gcc/testsuite/gcc.dg/format/cmn-err-1.c +index f6833c1723ad..cbb4a1f927c3 100644 +--- a/gcc/testsuite/gcc.dg/format/cmn-err-1.c ++++ b/gcc/testsuite/gcc.dg/format/cmn-err-1.c +@@ -19,6 +19,8 @@ int main() + llong ll = 3; + char hh = 4; + short h = 5; ++ size_t z = 6; ++ uintmax_t j = 7; + + cmn_err_func (0, "%s", string); + cmn_err_func (0, "%d %D %o %O %x %X %u", i, i, i, i, i, i, i); +@@ -28,6 +30,8 @@ int main() + cmn_err_func (0, "%hd %hD %ho %hO %hx %hX %hu", h, h, h, h, h, h, h); + cmn_err_func (0, "%hhd %hhD %hho %hhO %hhx %hhX %hhu", + hh, hh, hh, hh, hh, hh, hh); ++ cmn_err_func (0, "%jd %jD %jo %jO %jx %jX %ju", j, j, j, j, j, j, j); ++ cmn_err_func (0, "%zd %zD %zo %zO %zx %zX %zu", z, z, z, z, z, z, z); + cmn_err_func (0, "%b %s", i, "\01Foo", string); + cmn_err_func (0, "%p", string); + cmn_err_func (0, "%16b", i, "\01Foo"); diff --git a/build/gcc10/patches/0038-OOCE-Adjust-default-library-paths-for-OmniOS.patch b/build/gcc10/patches/0039-OOCE-Adjust-default-library-paths-for-OmniOS.patch similarity index 95% rename from build/gcc10/patches/0038-OOCE-Adjust-default-library-paths-for-OmniOS.patch rename to build/gcc10/patches/0039-OOCE-Adjust-default-library-paths-for-OmniOS.patch index 193c6af34a..b401707536 100644 --- a/build/gcc10/patches/0038-OOCE-Adjust-default-library-paths-for-OmniOS.patch +++ b/build/gcc10/patches/0039-OOCE-Adjust-default-library-paths-for-OmniOS.patch @@ -1,4 +1,4 @@ -From 28faf43be064f62ab42667a25bd626ba6f123d6a Mon Sep 17 00:00:00 2001 +From 0573580c97961bf1dbfcce097e55c1e842c3f65d Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Thu, 9 May 2019 13:43:30 +0000 Subject: OOCE: Adjust default library paths for OmniOS diff --git a/build/gcc10/patches/series b/build/gcc10/patches/series index dca17950a9..8fc90393a9 100644 --- a/build/gcc10/patches/series +++ b/build/gcc10/patches/series @@ -34,4 +34,5 @@ 0035-Add-__illumos__-preprocessor-definition.patch 0036-libstdc-must-use-thread-local-errno.patch 0037-cmn_err-supports-h-and-hh.patch -0038-OOCE-Adjust-default-library-paths-for-OmniOS.patch +0038-16768-kernel-printf-should-know-about-j-and-z-size-s.patch +0039-OOCE-Adjust-default-library-paths-for-OmniOS.patch