sim: igen: simplify build logic a little

Now that all ports (that use igen) build in the top-level and depend
on igen, we can move the conditional logic out of configure.  We also
switch from noinst_LIBRARIES to EXTRA_LIBRARIES so that the library
is only built when needed (i.e. the igen tool is used).

1 files changed, 2 insertions, 48 deletions

diff --git a/sim/configure b/sim/configure
index 3867d1e..70f7c23 100755
--- a/sim/configure
+++ b/sim/configure
@@ -668,8 +668,6 @@ cgendir
 CGEN_MAINT
 ENABLE_SIM_FALSE
 ENABLE_SIM_TRUE
-SIM_ENABLE_IGEN_FALSE
-SIM_ENABLE_IGEN_TRUE
 SIM_ENABLE_ARCH_examples_FALSE
 SIM_ENABLE_ARCH_examples_TRUE
 CC_FOR_TARGET_EXAMPLE_SYNACOR
@@ -12444,7 +12442,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12447 "configure"
+#line 12445 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12550,7 +12548,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12553 "configure"
+#line 12551 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14269,7 +14267,6 @@ ENABLE_SIM=no
 
 
 if test "${enable_sim}" != no; then
-  sim_igen=no
   for targ in `echo $target $enable_targets | sed 's/,/ /g'`
   do
       sim_enable_arch_aarch64=false
@@ -14285,7 +14282,6 @@ if test "${enable_sim}" != no; then
 
 
       sim_enable_arch_aarch64=true
-
       ;;
   esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target cc" >&5
@@ -14450,7 +14446,6 @@ fi
 
 
       sim_enable_arch_arm=true
-
       ;;
   esac
 
@@ -14488,7 +14483,6 @@ fi
 
 
       sim_enable_arch_avr=true
-
       ;;
   esac
 
@@ -14526,7 +14520,6 @@ fi
 
 
       sim_enable_arch_bfin=true
-
       ;;
   esac
 
@@ -14564,7 +14557,6 @@ fi
 
 
       sim_enable_arch_bpf=true
-
       ;;
   esac
 
@@ -14602,7 +14594,6 @@ fi
 
 
       sim_enable_arch_cr16=true
-
       ;;
   esac
 
@@ -14640,7 +14631,6 @@ fi
 
 
       sim_enable_arch_cris=true
-
       ;;
   esac
 
@@ -14678,7 +14668,6 @@ fi
 
 
       sim_enable_arch_d10v=true
-
       ;;
   esac
 
@@ -14716,7 +14705,6 @@ fi
 
 
       sim_enable_arch_frv=true
-
       ;;
   esac
 
@@ -14754,7 +14742,6 @@ fi
 
 
       sim_enable_arch_ft32=true
-
       ;;
   esac
 
@@ -14792,7 +14779,6 @@ fi
 
 
       sim_enable_arch_h8300=true
-
       ;;
   esac
 
@@ -14830,7 +14816,6 @@ fi
 
 
       sim_enable_arch_iq2000=true
-
       ;;
   esac
 
@@ -14868,7 +14853,6 @@ fi
 
 
       sim_enable_arch_lm32=true
-
       ;;
   esac
 
@@ -14906,7 +14890,6 @@ fi
 
 
       sim_enable_arch_m32c=true
-
       ;;
   esac
 
@@ -14944,7 +14927,6 @@ fi
 
 
       sim_enable_arch_m32r=true
-
       ;;
   esac
 
@@ -14982,7 +14964,6 @@ fi
 
 
       sim_enable_arch_m68hc11=true
-
       ;;
   esac
 
@@ -15020,7 +15001,6 @@ fi
 
 
       sim_enable_arch_mcore=true
-
       ;;
   esac
 
@@ -15058,7 +15038,6 @@ fi
 
 
       sim_enable_arch_microblaze=true
-
       ;;
   esac
 
@@ -15096,7 +15075,6 @@ fi
 
 
       sim_enable_arch_mips=true
-      sim_igen=yes
       ;;
   esac
 
@@ -15134,7 +15112,6 @@ fi
 
 
       sim_enable_arch_mn10300=true
-      sim_igen=yes
       ;;
   esac
 
@@ -15172,7 +15149,6 @@ fi
 
 
       sim_enable_arch_moxie=true
-
       ;;
   esac
 
@@ -15210,7 +15186,6 @@ fi
 
 
       sim_enable_arch_msp430=true
-
       ;;
   esac
 
@@ -15248,7 +15223,6 @@ fi
 
 
       sim_enable_arch_or1k=true
-
       ;;
   esac
 
@@ -15290,7 +15264,6 @@ subdirs="$subdirs ppc"
 
 
       sim_enable_arch_ppc=true
-
       ;;
   esac
 
@@ -15328,7 +15301,6 @@ fi
 
 
       sim_enable_arch_pru=true
-
       ;;
   esac
 
@@ -15366,7 +15338,6 @@ fi
 
 
       sim_enable_arch_riscv=true
-
       ;;
   esac
 
@@ -15404,7 +15375,6 @@ fi
 
 
       sim_enable_arch_rl78=true
-
       ;;
   esac
 
@@ -15442,7 +15412,6 @@ fi
 
 
       sim_enable_arch_rx=true
-
       ;;
   esac
 
@@ -15480,7 +15449,6 @@ fi
 
 
       sim_enable_arch_sh=true
-
       ;;
   esac
 
@@ -15518,7 +15486,6 @@ fi
 
 
       sim_enable_arch_erc32=true
-
       ;;
   esac
 
@@ -15556,7 +15523,6 @@ fi
 
 
       sim_enable_arch_v850=true
-      sim_igen=yes
       ;;
   esac
 
@@ -15610,14 +15576,6 @@ else
 fi
 
 fi
- if test "$sim_igen" = "yes"; then
-  SIM_ENABLE_IGEN_TRUE=
-  SIM_ENABLE_IGEN_FALSE='#'
-else
-  SIM_ENABLE_IGEN_TRUE='#'
-  SIM_ENABLE_IGEN_FALSE=
-fi
-
  if test "$ENABLE_SIM" = "yes"; then
   ENABLE_SIM_TRUE=
   ENABLE_SIM_FALSE='#'
@@ -16744,10 +16702,6 @@ if test -z "${SIM_ENABLE_ARCH_examples_TRUE}" && test -z "${SIM_ENABLE_ARCH_exam
   as_fn_error $? "conditional \"SIM_ENABLE_ARCH_examples\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${SIM_ENABLE_IGEN_TRUE}" && test -z "${SIM_ENABLE_IGEN_FALSE}"; then
-  as_fn_error $? "conditional \"SIM_ENABLE_IGEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_SIM_TRUE}" && test -z "${ENABLE_SIM_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_SIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5