Merge branch 'fix-stdio-pure' into zephyr-gcc-12.2.0

Author: nashif

gcc/Makefile.in

@@ -2197,7 +2197,7 @@ MULTILIB_OSDIRNAMES_SPACE = $(MULTILIB_OSDIRNAMES)
 MULTILIB_REQUIRED_SPACE = $(MULTILIB_REQUIRED)
 MULTILIB_EXCEPTIONS_SPACE = $(MULTILIB_EXCEPTIONS)
 MULTILIB_REUSE_SPACE = $(MULTILIB_REUSE)
-MULTILIB_ENABLE = @multilib@
+MULTILIB_ENABLE = @enable_multilib@
 endif
 
 # Use the genmultilib shell script to generate the information the gcc

gcc/config/microblaze/microblaze.h

@@ -115,7 +115,7 @@ extern enum pipeline_type microblaze_pipe;
   %{Zxl-mode-xmdstub:-defsym _TEXT_START_ADDR=0x800} \
   %{mxl-mode-xmdstub:-defsym _TEXT_START_ADDR=0x800} \
   %{mxl-gp-opt:%{G*}} %{!mxl-gp-opt: -G 0} \
-  %{!T*: -dT xilinx.ld%s}"
+  %{!r:%{!T*: -dT xilinx.ld%s}}"
 
 /* Specs for the compiler proper  */
 

gcc/config/rx/rx.h

@@ -115,7 +115,7 @@
 %{msim:-lsim}%{!msim:-lnosys}				\
 %{fprofile-arcs|fprofile-generate|coverage:-lgcov} 	\
 --end-group					   	\
-%{!T*: %{msim:%Trx-sim.ld}%{!msim:%Trx.ld}}		\
+%{!r:%{!T*: %{msim:%Trx-sim.ld}%{!msim:%Trx.ld}}}	\
 "
 
 #undef  LINK_SPEC

gcc/config/rx/rx.md

@@ -2541,10 +2541,20 @@
 	(unspec_volatile:SI [(match_operand:BLK 1 "memory_operand")     ;; String1
 			     (match_operand:BLK 2 "memory_operand")]    ;; String2
 			    UNSPEC_CMPSTRN))
-   (use (match_operand:SI                       3 "register_operand"))  ;; Max Length
+   (use (match_operand:SI                       3 "nonmemory_operand")) ;; Max Length
    (match_operand:SI                            4 "immediate_operand")] ;; Known Align
   "rx_allow_string_insns"
   {
+    bool const_len = CONST_INT_P(operands[3]);
+    if (const_len)
+    {
+      if (INTVAL(operands[3]) == 0)
+      {
+        emit_move_insn (operands[0], GEN_INT(0));
+        DONE;
+      }
+    }
+
     rtx str1 = gen_rtx_REG (SImode, 1);
     rtx str2 = gen_rtx_REG (SImode, 2);
     rtx len  = gen_rtx_REG (SImode, 3);
@@ -2553,6 +2563,11 @@
     emit_move_insn (str2, force_operand (XEXP (operands[2], 0), NULL_RTX));
     emit_move_insn (len, operands[3]);
 
+    /* Set flags in case len is zero */
+    if (!const_len) {
+      emit_insn (gen_setpsw (GEN_INT('C')));
+      emit_insn (gen_setpsw (GEN_INT('Z')));
+    }
     emit_insn (gen_rx_cmpstrn (operands[0], operands[1], operands[2]));
     DONE;
   }

libstdc++-v3/src/c++11/random.cc

@@ -45,7 +45,7 @@
 #include <cstdio>
 #include <cctype> // For std::isdigit.
 
-#if defined _GLIBCXX_HAVE_UNISTD_H && defined _GLIBCXX_HAVE_FCNTL_H
+#if defined _GLIBCXX_HAVE_UNISTD_H && defined _GLIBCXX_HAVE_FCNTL_H && !defined _GLIBCXX_USE_STDIO_PURE
 # include <unistd.h>
 # include <fcntl.h>
 // Use POSIX open, close, read etc. instead of ISO fopen, fclose, fread