[Bug libstdc++/103305] Cannot build libstdc++ with newlib on aarch64-none-elf or bfin-elf with new version of newlib

[redi at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103305

--- Comment #18 from Jonathan Wakely <redi at gcc dot gnu.org> ---

--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -1472,14 +1472,14 @@ sim_monitor (SIM_DESC sd,
                          sim_io_printf(sd,"<binary not supported>");
                        else
                          {
-#define _P(c, fmt64, fmt32) \
+#define P2(c, fmt64, fmt32) \
   case c: \
     if (longlong) \
       sim_io_printf (sd, "%" fmt64, lv); \
     else \
       sim_io_printf (sd, "%" fmt32, (int)lv); \
     break;
-#define P(c, fmtc) _P(c, PRI##fmtc##64, PRI##fmtc##32)
+#define P(c, fmtc) P2(c, PRI##fmtc##64, PRI##fmtc##32)
                            switch (c)
                              {
                              P('d', d)
@@ -1490,7 +1490,7 @@ sim_monitor (SIM_DESC sd,
                              }
                          }
 #undef P
-#undef _P
+#undef P2
                      }
                    else if (strchr ("eEfgG", c))
                      {