From aa09469fc64467d1748c6041befb55bbad9e2328 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 17 Jan 2021 13:39:03 -0500
Subject: sim: drop use of bfd/configure.host

These settings might have made sense in darker compiler times, but I
think they're largely obsolete now.  Looking through the values that
get used in HDEFINES, it's quite limited, and configure itself should
handle them.  If we still need something, we can leverage standard
autoconf macros instead, after we get a clear user report.

TDEFINES was never set anywhere and was always empty, so prune that.
---
 sim/ppc/ChangeLog    | 9 +++++++++
 sim/ppc/Makefile.in  | 6 ++----
 sim/ppc/configure    | 4 ----
 sim/ppc/configure.ac | 3 ---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'sim/ppc')

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 1086ea9..6de9e2d 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,12 @@
+2021-02-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (STD_CFLAGS): Delete $(HDEFINES) $(TDEFINES).
+	(NOWARN_CFLAGS): Likewise.
+	(HDEFINES, TDEFINES): Delete.
+	* configure.ac: Delete AC_SUBST(HDEFINES) and bfd/configure.host
+	sourcing.
+	* configure: Regenerate.
+
 2021-01-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (version.c): Simplifiy args and call move-if-change.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 8c62f44..3479e7a 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -103,8 +103,8 @@ CONFIG_CFLAGS = \
   $(DEVZERO_CFLAGS)
 SIM_FPU_CFLAGS = @sim_fpu_cflags@
 
-STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
+STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
+NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS)
 BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
 
 BUILD_LDFLAGS	=
@@ -121,8 +121,6 @@ IGEN_SMP = @sim_igen_smp@
 IGEN_LINE_NR = @sim_line_nr@
 DGEN_FLAGS = @sim_switch@
 
-HDEFINES = @HDEFINES@
-TDEFINES =
 IGEN_FLAGS = \
 	$(IGEN_DECODE_MECHANISM) \
 	$(IGEN_DUPLICATE) \
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 108c92a..594706d 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -652,7 +652,6 @@ sim_line_nr
 sim_warnings
 RANLIB
 AR
-HDEFINES
 CFLAGS_FOR_BUILD
 CC_FOR_BUILD
 LIBOBJS
@@ -6899,8 +6898,6 @@ fi
   fi
 
 
-. ${srcdir}/../../bfd/configure.host
-
 case ${host} in
   *mingw32*)
 
@@ -7761,7 +7758,6 @@ fi
 
 
 
-
 AR=${AR-ar}
 
 if test -n "$ac_tool_prefix"; then
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 9bc1057..e30f404 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -626,8 +626,6 @@ AM_ZLIB
 # BFD uses libdl when when plugins enabled.
 AC_PLUGINS
 
-. ${srcdir}/../../bfd/configure.host
-
 case ${host} in
   *mingw32*)
     AC_DEFINE(USE_WIN32API, 1,
@@ -835,7 +833,6 @@ AC_EXEEXT
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CFLAGS_FOR_BUILD)
 AC_SUBST(CFLAGS)
-AC_SUBST(HDEFINES)
 AR=${AR-ar}
 AC_SUBST(AR)
 AC_PROG_RANLIB
-- 
cgit v1.1