sim: ppc: inline the sim-packages option

This has only ever had a single option that's enabled by default.
The objects it adds are pretty small and don't add overhead at
runtime if it isn't used, so just enable it all the time to make
the build code simpler.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index b1fda1fbff4281fe44cd829aff48110ec015d238..6575f962c9dd56633c7ef53c1baf3b4e32a5fbc0 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -516,8 +516,8 @@ GDB_OBJ = gdb-sim.o sim_calls.o
 HW_SRC = @sim_hw_src@
 HW_OBJ = @sim_hw_obj@
 
-PACKAGE_SRC = @sim_pk_src@
-PACKAGE_OBJ = @sim_pk_obj@
+PACKAGE_SRC = pk_disklabel.c
+PACKAGE_OBJ = $(PACKAGE_SRC:.c=.o)
 
 
 psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB)
@@ -528,7 +528,7 @@ run$(EXEEXT): psim$(EXEEXT)
        $(SILENCE) rm -f $@
        $(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
 
-$(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ)
+$(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-defines $(LIB_OBJ) $(GDB_OBJ)
        $(ECHO_AR) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
        $(ECHO_RANLIB) $(RANLIB) $(TARGETLIB)
 
@@ -782,10 +782,12 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H)
 
 
 # real packages
-pk.h: tmp-pk; @true
-tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change
+$(srcdir)/pk.h: $(MAINT) tmp-pk
+       @true
+tmp-pk: $(srcdir)/Makefile.in $(PACKAGE_SRC) $(srcroot)/move-if-change
        $(ECHO_GEN)# The first for loop is to remove duplicates.
-       $(SILENCE) f=""; \
+       $(SILENCE) echo "/* Generated file by Makefile.in; do not edit.  */" > tmp-pk.h; \
+       f=""; \
        for i in $(PACKAGE_SRC) ; do \
          case " $$f " in \
            *" $$i "*) ;; \
@@ -796,8 +798,8 @@ tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change
        | sed -e 's/^.*pk_\(.*\)\.c/\1/' \
                -e 's/^/extern package_create_instance_callback pk_/' \
                -e 's/$$/_create_instance;/' \
-               > tmp-pk.h
-       $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-pk.h pk.h
+               >> tmp-pk.h
+       $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-pk.h $(srcdir)/pk.h
        $(SILENCE) touch $@
 
 pk_disklabel.o: pk_disklabel.c $(DEVICE_TABLE_H) $(PK_H)

diff --git a/sim/ppc/configure b/sim/ppc/configure
index 985578462360ba4a7e8bdb3746182f105c7a447c..c202901dabcdc0510ac663b585daa3abb4887dae 100755 (executable)
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -634,8 +634,6 @@ sim_bitsize
 sim_igen_smp
 sim_smp
 sim_xor_endian
-sim_pk_obj
-sim_pk_src
 sim_hw_obj
 sim_hw_src
 sim_icache
@@ -727,7 +725,6 @@ enable_sim_model
 enable_sim_model_issue
 enable_sim_monitor
 enable_sim_opcode
-enable_sim_packages
 enable_sim_smp
 enable_sim_switch
 enable_sim_timebase
@@ -1369,7 +1366,6 @@ Optional Features:
   --enable-sim-model-issue             Specify whether to simulate model specific actions
   --enable-sim-monitor=mon             Specify whether to enable monitoring events.
   --enable-sim-opcode=which            Override default opcode lookup.
-  --enable-sim-packages=list           Specify the packages to be included in the build.
   --enable-sim-smp=n                   Specify number of processors to configure for.
   --enable-sim-switch                  Use a switch instead of a table for instruction call.
   --enable-sim-timebase                        Specify whether the PPC timebase is supported.
@@ -3497,31 +3493,6 @@ fi
 fi
 
 
-# Check whether --enable-sim-packages was given.
-if test "${enable_sim_packages+set}" = set; then :
-  enableval=$enable_sim_packages; packages=disklabel
-case "${enableval}" in
-  yes) ;;
-  no)  as_fn_error $? "\"List of packages must be specified for --enable-sim-packages\"" "$LINENO" 5; packages="";;
-  ,*)   packages="${packages}${enableval}";;
-  *,)   packages="${enableval}${packages}";;
-  *)   packages="${enableval}"'';;
-esac
-sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'`
-sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'`
-if test x"$silent" != x"yes" && test x"$packages" != x""; then
-  echo "Setting packages to $sim_pk_src, $sim_pk_obj"
-fi
-else
-  packages=disklabel
-sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'`
-sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'`
-if test x"$silent" != x"yes"; then
-  echo "Setting packages to $sim_pk_src, $sim_pk_obj"
-fi
-fi
-
-
 # Check whether --enable-sim-smp was given.
 if test "${enable_sim_smp+set}" = set; then :
   enableval=$enable_sim_smp; case "${enableval}" in
@@ -4301,8 +4272,6 @@ fi
 
 
 
-
-
 
 
 

diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index b5909b705719f42d0e561d3425ce0e4a8a5b6793..f26912eacde0d9542c13be9c1ab771f32bdca571 100644 (file)
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -337,28 +337,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-packages,
-[  --enable-sim-packages=list          Specify the packages to be included in the build.],
-[packages=disklabel
-case "${enableval}" in
-  yes) ;;
-  no)  AC_MSG_ERROR("List of packages must be specified for --enable-sim-packages"); packages="";;
-  ,*)   packages="${packages}${enableval}";;
-  *,)   packages="${enableval}${packages}";;
-  *)   packages="${enableval}"'';;
-esac
-sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'`
-sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'`
-if test x"$silent" != x"yes" && test x"$packages" != x""; then
-  echo "Setting packages to $sim_pk_src, $sim_pk_obj"
-fi],[packages=disklabel
-sim_pk_src=`echo $packages | sed -e 's/,/.c pk_/g' -e 's/^/pk_/' -e 's/$/.c/'`
-sim_pk_obj=`echo $sim_pk_src | sed -e 's/\.c/.o/g'`
-if test x"$silent" != x"yes"; then
-  echo "Setting packages to $sim_pk_src, $sim_pk_obj"
-fi])dnl
-
-
 AC_ARG_ENABLE(sim-smp,
 [  --enable-sim-smp=n                  Specify number of processors to configure for.],
 [case "${enableval}" in
@@ -590,8 +568,6 @@ AC_SUBST(sim_filter)
 AC_SUBST(sim_icache)
 AC_SUBST(sim_hw_src)
 AC_SUBST(sim_hw_obj)
-AC_SUBST(sim_pk_src)
-AC_SUBST(sim_pk_obj)
 AC_SUBST(sim_xor_endian)
 AC_SUBST(sim_smp)
 AC_SUBST(sim_igen_smp)

diff --git a/sim/ppc/pk.h b/sim/ppc/pk.h
new file mode 100644 (file)
index 0000000..b4de996
--- /dev/null
+++ b/sim/ppc/pk.h
@@ -0,0 +1,2 @@
+/* Generated file; do not edit.  */
+extern package_create_instance_callback pk_disklabel_create_instance;