diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-11-05 09:29:17 +0700 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-11-05 10:04:22 +0700 |
commit | 319e41e83a405bcc975c706faa172a0c2ab63598 (patch) | |
tree | 7c94746b1be30a35b3818a5f293a4a964285dfed /sim/ppc | |
parent | 31ee179e275a25625f66e7045a651433f9856087 (diff) | |
download | fsf-binutils-gdb-319e41e83a405bcc975c706faa172a0c2ab63598.zip fsf-binutils-gdb-319e41e83a405bcc975c706faa172a0c2ab63598.tar.gz fsf-binutils-gdb-319e41e83a405bcc975c706faa172a0c2ab63598.tar.bz2 |
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.
Diffstat (limited to 'sim/ppc')
-rw-r--r-- | sim/ppc/Makefile.in | 18 | ||||
-rwxr-xr-x | sim/ppc/configure | 31 | ||||
-rw-r--r-- | sim/ppc/configure.ac | 24 | ||||
-rw-r--r-- | sim/ppc/pk.h | 2 |
4 files changed, 12 insertions, 63 deletions
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index b1fda1f..6575f96 100644 --- 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 9855784..c202901 100755 --- 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 @@ -4304,8 +4275,6 @@ fi - - ac_config_files="$ac_config_files Makefile" ac_config_commands="$ac_config_commands default" diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index b5909b7..f26912e 100644 --- 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 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; |