[binutils-gdb] sim: rl78/rx: drop unnecessary getopt.h probing

[binutils-gdb] sim: rl78/rx: drop unnecessary getopt.h probing

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d549b029d6d622af531211ef4c7bc48cb5011d93

commit d549b029d6d622af531211ef4c7bc48cb5011d93
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue Apr 20 09:21:28 2021 -0400

    sim: rl78/rx: drop unnecessary getopt.h probing
    
    Since getopt.h is provided by libiberty, there's no need to probe for
    a system version of it.  Plus we already assume it exists in other
    parts of the sim.

Diff:
---
 sim/rl78/ChangeLog    | 6 ++++++
 sim/rl78/config.in    | 3 ---
 sim/rl78/configure    | 9 ++-------
 sim/rl78/configure.ac | 2 --
 sim/rl78/main.c       | 2 --
 sim/rx/ChangeLog      | 6 ++++++
 sim/rx/config.in      | 3 ---
 sim/rx/configure      | 9 ++-------
 sim/rx/configure.ac   | 2 --
 sim/rx/main.c         | 2 --
 10 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 32cd4352982..f14e4fcd219 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete AC_CHECK_HEADERS_ONCE.
+	* main.c: Delete HAVE_GETOPT_H.
+	* config.in, configure: Regenerate.
+
 2021-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Change AC_CHECK_HEADERS to AC_CHECK_HEADERS_ONCE.
diff --git a/sim/rl78/config.in b/sim/rl78/config.in
index e4894c4c510..cb5ea1b01c9 100644
--- a/sim/rl78/config.in
+++ b/sim/rl78/config.in
@@ -22,9 +22,6 @@
 /* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE
 
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 8ba5fd0cae5..7ad7eac31d1 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -2302,7 +2302,6 @@ as_fn_append ac_func_list " posix_fallocate"
 as_fn_append ac_func_list " sigaction"
 as_fn_append ac_func_list " time"
 as_fn_append ac_func_list " truncate"
-as_fn_append ac_header_list " getopt.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -11244,7 +11243,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11247 "configure"
+#line 11246 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11350,7 +11349,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11353 "configure"
+#line 11352 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11996,10 +11995,6 @@ fi
 
 
 
-
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index fad367ce7b6..0e5f69c7065 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -24,6 +24,4 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 SIM_AC_COMMON
 SIM_AC_OPTION_WARNINGS(no)
 
-AC_CHECK_HEADERS_ONCE(getopt.h)
-
 SIM_AC_OUTPUT
diff --git a/sim/rl78/main.c b/sim/rl78/main.c
index 3050863e9cc..8d8a79d5da8 100644
--- a/sim/rl78/main.c
+++ b/sim/rl78/main.c
@@ -30,9 +30,7 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <signal.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#endif
 
 #include "libiberty.h"
 #include "bfd.h"
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index be4c653cfd9..ac9531d11f0 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete AC_CHECK_HEADERS_ONCE.
+	* main.c: Delete HAVE_GETOPT_H.
+	* config.in, configure: Regenerate.
+
 2021-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Change AC_CHECK_HEADERS to AC_CHECK_HEADERS_ONCE.
diff --git a/sim/rx/config.in b/sim/rx/config.in
index 97caf8d0532..7dd69ef2519 100644
--- a/sim/rx/config.in
+++ b/sim/rx/config.in
@@ -28,9 +28,6 @@
 /* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE
 
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
diff --git a/sim/rx/configure b/sim/rx/configure
index ba9d433c9c7..ab2f25dd541 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -2307,7 +2307,6 @@ as_fn_append ac_func_list " posix_fallocate"
 as_fn_append ac_func_list " sigaction"
 as_fn_append ac_func_list " time"
 as_fn_append ac_func_list " truncate"
-as_fn_append ac_header_list " getopt.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -11249,7 +11248,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11252 "configure"
+#line 11251 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11355,7 +11354,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11358 "configure"
+#line 11357 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11903,10 +11902,6 @@ _ACEOF
 
 
 
-
-
-
-
 # Check whether --enable-cycle-accurate was given.
 if test "${enable_cycle_accurate+set}" = set; then :
   enableval=$enable_cycle_accurate; case "${enableval}" in
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index 344ab3967f7..5d1076834c1 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -23,8 +23,6 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
-AC_CHECK_HEADERS_ONCE(getopt.h)
-
 AC_ARG_ENABLE(cycle-accurate,
 [AS_HELP_STRING([--disable-cycle-accurate],
 		[Disable cycle accurate simulation (faster runtime)])],
diff --git a/sim/rx/main.c b/sim/rx/main.c
index 4a9d3ecebea..20a8434388e 100644
--- a/sim/rx/main.c
+++ b/sim/rx/main.c
@@ -29,9 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <assert.h>
 #include <setjmp.h>
 #include <signal.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#endif
 
 #include "bfd.h"