diff -ur gcc-11.3.0.orig/gcc/config/h8300/t-h8300 gcc-11.3.0/gcc/config/h8300/t-h8300 --- gcc-11.3.0.orig/gcc/config/h8300/t-h8300 2022-04-21 16:58:52.867586161 +0900 +++ gcc-11.3.0/gcc/config/h8300/t-h8300 2022-10-16 21:11:06.166481566 +0900 @@ -16,8 +16,8 @@ # along with GCC; see the file COPYING3. If not see # . -MULTILIB_OPTIONS = ms/msx mn mint32 -MULTILIB_DIRNAMES = h8300s h8sx normal int32 +MULTILIB_OPTIONS = ms/msx mint32 +MULTILIB_DIRNAMES = h8300s h8sx int32 s-config s-conditions s-flags s-codes s-constants s-emit s-recog \ s-opinit s-extract s-peep s-attr s-attrtab s-output: \ diff -ur gcc-11.3.0.orig/include/demangle.h gcc-11.3.0/include/demangle.h --- gcc-11.3.0.orig/include/demangle.h 2022-04-21 16:58:55.923589537 +0900 +++ gcc-11.3.0/include/demangle.h 2022-10-16 21:59:16.002821816 +0900 @@ -54,9 +54,9 @@ #define DMGL_AUTO (1 << 8) #define DMGL_GNU_V3 (1 << 14) -#define DMGL_GNAT (1 << 15) -#define DMGL_DLANG (1 << 16) -#define DMGL_RUST (1 << 17) /* Rust wraps GNU_V3 style mangling. */ +#define DMGL_GNAT (1 << 13) +#define DMGL_DLANG (1 << 12) +#define DMGL_RUST (1 << 11) /* Rust wraps GNU_V3 style mangling. */ /* If none of these are set, use 'current_demangling_style' as the default. */ #define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG|DMGL_RUST) @@ -65,7 +65,7 @@ Note if this limit is disabled then stack exhaustion is possible when demangling pathologically complicated strings. Bug reports about stack exhaustion when the option is enabled will be rejected. */ -#define DMGL_NO_RECURSE_LIMIT (1 << 18) +#define DMGL_NO_RECURSE_LIMIT (1 << 10) /* If DMGL_NO_RECURSE_LIMIT is not enabled, then this is the value used as the maximum depth of recursion allowed. It should be enough for any diff -ur gcc-11.3.0.orig/libstdc++-v3/src/c++17/memory_resource.cc gcc-11.3.0/libstdc++-v3/src/c++17/memory_resource.cc --- gcc-11.3.0.orig/libstdc++-v3/src/c++17/memory_resource.cc 2022-04-21 16:58:57.079590813 +0900 +++ gcc-11.3.0/libstdc++-v3/src/c++17/memory_resource.cc 2022-10-16 20:59:40.270573963 +0900 @@ -873,9 +873,9 @@ 1024, 1536, 2048, 3072, #if __SIZE_WIDTH__ > 20 - 1<<12, 1<<13, 1<<14, - 1<<15, 1<<16, 1<<17, - 1<<20, 1<<21, 1<<22 // 4MB should be enough for anybody + (size_t)1<<12, (size_t)1<<13, (size_t)1<<14, + (size_t)1<<15, (size_t)1<<16, (size_t)1<<17, + (size_t)1<<20, (size_t)1<<21, (size_t)1<<22 // 4MB should be enough for anybody #endif #endif };