Merge from trunk revision aa8f4242efc99f24de73c59d53996f28db28c13f.

23 files changed, 62 insertions, 23 deletions

diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index a599349..2a303b8 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,17 @@
+2023-01-07  LIU Hao  <lh_mouse@126.com>
+
+	PR middle-end/108300
+	* ssp.c: Define `WIN32_LEAN_AND_MEAN` before <windows.h>.
+
+2022-10-12  Martin Liska  <mliska@suse.cz>
+
+	* configure: Regenerate.
+
+2022-10-11  Olivier Hainque  <hainque@adacore.com>
+	    Olivier Hainque  <hainque@adacore.com>
+
+	* configure: Regenerate.
+
 2022-08-25  Martin Liska  <mliska@suse.cz>
 
 	* configure: Regenerate.
diff --git a/libssp/Makefile.am b/libssp/Makefile.am
index 945dc3c..1636e43 100644
--- a/libssp/Makefile.am
+++ b/libssp/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the toplevel directory of the libssp library.
 ##
-## Copyright (C) 2005-2022 Free Software Foundation, Inc.
+## Copyright (C) 2005-2023 Free Software Foundation, Inc.
 ##
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/libssp/configure b/libssp/configure
index b27ae22..492915d 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -6006,6 +6006,11 @@ sysv4 | sysv4.3*)
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+vxworks*)
+  # Assume VxWorks cross toolchains are built on Linux, possibly
+  # as canadian for Windows hosts.
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
@@ -10536,6 +10541,25 @@ uts4*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+# Shared libraries for VwWorks, >= 7 only at this stage
+# and (fpic) still incompatible with "large" code models
+# in a few configurations. Only for RTP mode in any case,
+# and upon explicit request at configure time.
+vxworks7*)
+  dynamic_linker=no
+  case ${with_multisubdir}-${enable_shared} in
+    *large*)
+      ;;
+    *mrtp*-yes)
+      version_type=linux
+      need_lib_prefix=no
+      need_version=no
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      dynamic_linker="$host_os module_loader"
+      ;;
+  esac
+  ;;
 *)
   dynamic_linker=no
   ;;
@@ -10992,7 +11016,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10995 "configure"
+#line 11019 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11098,7 +11122,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11101 "configure"
+#line 11125 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/libssp/gets-chk.c b/libssp/gets-chk.c
index 14576b5..23ac8dd 100644
--- a/libssp/gets-chk.c
+++ b/libssp/gets-chk.c
@@ -1,5 +1,5 @@
 /* Checking gets.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/memcpy-chk.c b/libssp/memcpy-chk.c
index 1918a39..b3a812f 100644
--- a/libssp/memcpy-chk.c
+++ b/libssp/memcpy-chk.c
@@ -1,5 +1,5 @@
 /* Checking memcpy.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/memmove-chk.c b/libssp/memmove-chk.c
index 444f869..780c04c 100644
--- a/libssp/memmove-chk.c
+++ b/libssp/memmove-chk.c
@@ -1,5 +1,5 @@
 /* Checking memmove.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/mempcpy-chk.c b/libssp/mempcpy-chk.c
index dc16aef..d24bb9b 100644
--- a/libssp/mempcpy-chk.c
+++ b/libssp/mempcpy-chk.c
@@ -1,5 +1,5 @@
 /* Checking mempcpy.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/memset-chk.c b/libssp/memset-chk.c
index 4a72052..50d2afd 100644
--- a/libssp/memset-chk.c
+++ b/libssp/memset-chk.c
@@ -1,5 +1,5 @@
 /* Checking memset.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/snprintf-chk.c b/libssp/snprintf-chk.c
index 4c3730d..f3e31c3 100644
--- a/libssp/snprintf-chk.c
+++ b/libssp/snprintf-chk.c
@@ -1,5 +1,5 @@
 /* Checking snprintf.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/sprintf-chk.c b/libssp/sprintf-chk.c
index 02e3237..413a0ac 100644
--- a/libssp/sprintf-chk.c
+++ b/libssp/sprintf-chk.c
@@ -1,5 +1,5 @@
 /* Checking sprintf.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/ssp-local.c b/libssp/ssp-local.c
index 520918f..8bc2abe 100644
--- a/libssp/ssp-local.c
+++ b/libssp/ssp-local.c
@@ -1,5 +1,5 @@
 /* Stack protector support.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/ssp.c b/libssp/ssp.c
index 72b7a1d..d37cca6 100644
--- a/libssp/ssp.c
+++ b/libssp/ssp.c
@@ -1,5 +1,5 @@
 /* Stack protector support.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* Native win32 apps don't know about /dev/tty but can print directly
    to the console using  "CONOUT$"   */
 #if defined (_WIN32) && !defined (__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wincrypt.h>
 # define _PATH_TTY "CONOUT$"
diff --git a/libssp/ssp/ssp.h.in b/libssp/ssp/ssp.h.in
index 25ddc28..08adefb 100644
--- a/libssp/ssp/ssp.h.in
+++ b/libssp/ssp/ssp.h.in
@@ -1,5 +1,5 @@
 /* Object size checking support macros.
-   Copyright (C) 2004-2022 Free Software Foundation, Inc.
+   Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/ssp/stdio.h b/libssp/ssp/stdio.h
index 5e47300..e9d3909 100644
--- a/libssp/ssp/stdio.h
+++ b/libssp/ssp/stdio.h
@@ -1,5 +1,5 @@
 /* Checking macros for stdio functions.
-   Copyright (C) 2004-2022 Free Software Foundation, Inc.
+   Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/ssp/string.h b/libssp/ssp/string.h
index 98b5719..41ccede 100644
--- a/libssp/ssp/string.h
+++ b/libssp/ssp/string.h
@@ -1,5 +1,5 @@
 /* Checking macros for string functions.
-   Copyright (C) 2004-2022 Free Software Foundation, Inc.
+   Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/ssp/unistd.h b/libssp/ssp/unistd.h
index 9609615..f8d8fc9 100644
--- a/libssp/ssp/unistd.h
+++ b/libssp/ssp/unistd.h
@@ -1,5 +1,5 @@
 /* Checking macros for unistd functions.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/stpcpy-chk.c b/libssp/stpcpy-chk.c
index 1a76419..dd01eb3 100644
--- a/libssp/stpcpy-chk.c
+++ b/libssp/stpcpy-chk.c
@@ -1,5 +1,5 @@
 /* Checking stpcpy.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/strcat-chk.c b/libssp/strcat-chk.c
index b06d66b..0f481f4 100644
--- a/libssp/strcat-chk.c
+++ b/libssp/strcat-chk.c
@@ -1,5 +1,5 @@
 /* Checking strcat.
-   Copyright (C) 1991-2022 Free Software Foundation, Inc.
+   Copyright (C) 1991-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/strcpy-chk.c b/libssp/strcpy-chk.c
index 8cb86df..815c582e 100644
--- a/libssp/strcpy-chk.c
+++ b/libssp/strcpy-chk.c
@@ -1,5 +1,5 @@
 /* Checking strcpy.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/strncat-chk.c b/libssp/strncat-chk.c
index 9a8cc17..b8842d1 100644
--- a/libssp/strncat-chk.c
+++ b/libssp/strncat-chk.c
@@ -1,5 +1,5 @@
 /* Checking strncat.
-   Copyright (C) 1991-2022 Free Software Foundation, Inc.
+   Copyright (C) 1991-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/strncpy-chk.c b/libssp/strncpy-chk.c
index ea277a2..4d3f7e1 100644
--- a/libssp/strncpy-chk.c
+++ b/libssp/strncpy-chk.c
@@ -1,5 +1,5 @@
 /* Checking strncpy.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/vsnprintf-chk.c b/libssp/vsnprintf-chk.c
index 30d3c64..efc4798 100644
--- a/libssp/vsnprintf-chk.c
+++ b/libssp/vsnprintf-chk.c
@@ -1,5 +1,5 @@
 /* Checking vsnprintf.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
diff --git a/libssp/vsprintf-chk.c b/libssp/vsprintf-chk.c
index 1abaca8..e69d493 100644
--- a/libssp/vsprintf-chk.c
+++ b/libssp/vsprintf-chk.c
@@ -1,5 +1,5 @@
 /* Checking vsprintf.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
 
 This file is part of GCC.