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/Makefile.in

@@ -257,12 +257,13 @@ CONFIG_CLEAN_FILES = Make-common.sim aarch64/Makefile.sim \
 	m68hc11/.gdbinit mcore/Makefile.sim mcore/.gdbinit \
 	microblaze/Makefile.sim microblaze/.gdbinit mips/.gdbinit \
 	mn10300/.gdbinit moxie/Makefile.sim moxie/.gdbinit \
-	msp430/Makefile.sim msp430/.gdbinit or1k/.gdbinit ppc/.gdbinit \
-	pru/Makefile.sim pru/.gdbinit riscv/Makefile.sim \
-	riscv/.gdbinit rl78/Makefile.sim rl78/.gdbinit rx/Makefile.sim \
-	rx/.gdbinit sh/Makefile.sim sh/.gdbinit erc32/Makefile.sim \
-	erc32/.gdbinit v850/.gdbinit example-synacor/Makefile.sim \
-	example-synacor/.gdbinit arch-subdir.mk .gdbinit
+	msp430/Makefile.sim msp430/.gdbinit or1k/Makefile.sim \
+	or1k/.gdbinit ppc/.gdbinit pru/Makefile.sim pru/.gdbinit \
+	riscv/Makefile.sim riscv/.gdbinit rl78/Makefile.sim \
+	rl78/.gdbinit rx/Makefile.sim rx/.gdbinit sh/Makefile.sim \
+	sh/.gdbinit erc32/Makefile.sim erc32/.gdbinit v850/.gdbinit \
+	example-synacor/Makefile.sim example-synacor/.gdbinit \
+	arch-subdir.mk .gdbinit
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
@@ -1768,6 +1769,8 @@ msp430/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/msp430/Makefile
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 msp430/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+or1k/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/or1k/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 or1k/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 ppc/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in

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 \

sim/configure.ac

@@ -147,7 +147,7 @@ if test "${enable_sim}" != no; then
     SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes])
     SIM_TARGET([moxie-*-*], [moxie])
     SIM_TARGET([msp430*-*-*], [msp430])
-    SIM_TARGET([or1k*-*-*], [or1k], [true])
+    SIM_TARGET([or1k*-*-*], [or1k])
     SIM_TARGET([powerpc*-*-*], [ppc], [true])
     SIM_TARGET([pru*-*-*], [pru])
     SIM_TARGET([riscv*-*-*], [riscv])

sim/or1k/Makefile.in

@@ -40,6 +40,8 @@ SIM_OBJS = \
 
 SIM_OBJS += $(OR1K_OBJS)
 
+SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
+
 ## COMMON_POST_CONFIG_FRAG
 
 arch = or1k

sim/or1k/aclocal.m4

@@ -1,16 +0,0 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_output.m4])

sim/or1k/configure.ac

@@ -1,7 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
-
-SIM_AC_OPTION_BITSIZE([32], [31])
-
-SIM_AC_OUTPUT