From 88bbac7c76e89cd3de75a25e46a69a4e7b608bff Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 12 Nov 2023 17:51:58 +0100
Subject: [PATCH] Regenerate gas/config.in and ld/configure

commit d173146d9 "MIPS: Change all E_MIPS_* to EF_MIPS_*"
changed gas/config.in to rename USE_E_MIPS_ABI_O32 to USE_EF_MIPS_ABI_O32
this new name sorts differently when regenerating gas/config.in

commit e922d1eaa "Add ability to change linker warning messages into
errors when reporting executable stacks and/or executable segments."
Introduced two new help strings for --enable-error-execstack and
--enable-error-rwx-segments in configure.ac which weren't included
in ld/configure when regenerated.

	* gas/config.in: Regenerate.
	* ld/configure: Likewise.
---
 gas/config.in | 6 +++---
 ld/configure  | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gas/config.in b/gas/config.in
index ea21757f6a7..6333a964c71 100644
--- a/gas/config.in
+++ b/gas/config.in
@@ -261,12 +261,12 @@
 /* Use b modifier when opening binary files? */
 #undef USE_BINARY_FOPEN
 
-/* Use emulation support? */
-#undef USE_EMULATIONS
-
 /* Allow use of EF_MIPS_ABI_O32 on MIPS targets. */
 #undef USE_EF_MIPS_ABI_O32
 
+/* Use emulation support? */
+#undef USE_EMULATIONS
+
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
diff --git a/ld/configure b/ld/configure
index 468c3bd525d..46d9f3c7111 100755
--- a/ld/configure
+++ b/ld/configure
@@ -1536,9 +1536,13 @@ Optional Features:
                           enable DT_TEXTREL check in ELF linker
   --enable-separate-code  enable -z separate-code in ELF linker by default
   --enable-warn-execstack enable warnings when creating an executable stack
+  --enable-error-execstack
+                          turn executable stack warnings into errors
   --enable-warn-rwx-segments
                           enable warnings when creating segments with RWX
                           permissions
+  --enable-error-rwx-segments
+                          turn executable segment warnings into errors
   --enable-default-execstack
                           create an executable stack if an input file is
                           missing a .note.GNU-stack section
@@ -11657,7 +11661,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11658 "configure"
+#line 11664 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11763,7 +11767,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11764 "configure"
+#line 11770 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
-- 
2.30.2