From 763b20abcbfa3e35fc69ac3c8a56183039ee8c69 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 7 Nov 2022 23:04:25 +0700
Subject: sim: or1k: drop subdir configure logic

We've been using this only to set the default word size to 32.  We
can easily move this into the makefile via a -D compiler flag and
clean up the build logic quite a bit.
---
 sim/configure | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'sim/configure')

diff --git a/sim/configure b/sim/configure
index af93f47..d29220f 100755
--- a/sim/configure
+++ b/sim/configure
@@ -1112,7 +1112,6 @@ LD_FOR_TARGET_EXAMPLE_SYNACOR
 CC_FOR_TARGET_EXAMPLE_SYNACOR'
 ac_subdirs_all='mips
 mn10300
-or1k
 ppc
 v850'
 
@@ -12428,7 +12427,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12431 "configure"
+#line 12430 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12534,7 +12533,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12537 "configure"
+#line 12536 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15331,8 +15330,11 @@ fi
         SIM_PRIMARY_TARGET=or1k
       fi
         as_fn_append SIM_ENABLED_ARCHES " or1k"
-      subdirs="$subdirs or1k"
+      ac_config_files="$ac_config_files or1k/Makefile.sim:or1k/Makefile.in"
 
+    ac_config_commands="$ac_config_commands or1k/Makefile"
+
+    as_fn_append SIM_SUBDIRS " or1k"
 
   ac_config_files="$ac_config_files or1k/.gdbinit:common/gdbinit.in"
 
@@ -17552,6 +17554,8 @@ do
     "msp430/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS msp430/Makefile" ;;
     "msp430/.gdbinit") CONFIG_FILES="$CONFIG_FILES msp430/.gdbinit:common/gdbinit.in" ;;
     "depdir-msp430") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-msp430" ;;
+    "or1k/Makefile.sim") CONFIG_FILES="$CONFIG_FILES or1k/Makefile.sim:or1k/Makefile.in" ;;
+    "or1k/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS or1k/Makefile" ;;
     "or1k/.gdbinit") CONFIG_FILES="$CONFIG_FILES or1k/.gdbinit:common/gdbinit.in" ;;
     "depdir-or1k") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-or1k" ;;
     "ppc/.gdbinit") CONFIG_FILES="$CONFIG_FILES ppc/.gdbinit:common/gdbinit.in" ;;
@@ -19178,6 +19182,18 @@ $as_echo X"$file" |
  rm -f msp430/Makesim1.tmp msp430/Makesim2.tmp
  ;;
     "depdir-msp430":C) $SHELL $ac_aux_dir/mkinstalldirs msp430/$DEPDIR ;;
+    "or1k/Makefile":C) sed -n \
+	-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
+		/^srcdir = / s:$:/or1k:
+		p
+	}' \
+	<Make-common.sim >or1k/Makesim1.tmp
+ sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >or1k/Makesim2.tmp
+ sed -e '/^## COMMON_PRE_/ r or1k/Makesim1.tmp' \
+	-e '/^## COMMON_POST_/ r or1k/Makesim2.tmp' \
+	<or1k/Makefile.sim >or1k/Makefile
+ rm -f or1k/Makesim1.tmp or1k/Makesim2.tmp
+ ;;
     "depdir-or1k":C) $SHELL $ac_aux_dir/mkinstalldirs or1k/$DEPDIR ;;
     "depdir-ppc":C) $SHELL $ac_aux_dir/mkinstalldirs ppc/$DEPDIR ;;
     "pru/Makefile":C) sed -n \
-- 
cgit v1.1