diff options
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 9 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 8 | ||||
| -rw-r--r-- | sim/common/defs.h | 18 |
3 files changed, 13 insertions, 22 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 7e21703..60b94cf 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,12 @@ +2021-06-16 Mike Frysinger <vapier@gentoo.org> + + * Make-common.in (CONFIG_CFLAGS): Change @DEFS@ to -DHAVE_CONFIG_H. + (generated_files): Delete config.h. + (distclean): Likewise. + (config.h, stamp-h): Delete rules. + * defs.h [SIM_COMMON_BUILD]: Delete config.h include and PACKAGE* + defines. + 2021-06-15 Mike Frysinger <vapier@gentoo.org> * Make-common.in: Add stamp-modules rule to avoid rebuilds. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 12fb233..54ac7f4 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -218,7 +218,7 @@ CGEN_INCLUDE_DEPS = \ ## COMMON_POST_CONFIG_FRAG CONFIG_CFLAGS = \ - @DEFS@ \ + -DHAVE_CONFIG_H \ $(SIM_DEFAULT_MODEL) \ $(SIM_BITSIZE) \ $(SIM_ENDIAN) \ @@ -423,7 +423,6 @@ endif all_object_files = $(LIB_OBJS) $(SIM_RUN_OBJS) generated_files = \ $(SIM_EXTRA_DEPS) \ - config.h \ hw-config.h \ modules.c \ targ-map.c \ @@ -554,7 +553,6 @@ mostlyclean clean: $(SIM_EXTRA_CLEAN) distclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN) rm -f TAGS rm -f Makefile config.cache config.log config.status .gdbinit - rm -f config.h stamp-h .c.o: $(COMPILE) $< @@ -569,10 +567,6 @@ Makefile: Makefile.in $(srccom)/Make-common.in config.status config.status: configure $(SHELL) ./config.status --recheck -config.h: stamp-h ; @true -stamp-h: config.in config.status - CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status - .gdbinit: # config.status $(srccom)/gdbinit.in CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/sim/common/defs.h b/sim/common/defs.h index 21ad2a4..8bf1299 100644 --- a/sim/common/defs.h +++ b/sim/common/defs.h @@ -34,23 +34,11 @@ #undef PACKAGE_URL #undef PACKAGE_VERSION -/* Include arch-specific sim's various configure tests. */ -#include "config.h" - -#ifndef SIM_COMMON_BUILD - -/* Reset macros that our config.h will provide. */ -#undef PACKAGE -#undef PACKAGE_BUGREPORT -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME -#undef PACKAGE_URL -#undef PACKAGE_VERSION - /* Include common sim's various configure tests. */ +#ifndef SIM_COMMON_BUILD #include "../config.h" - +#else +#include "config.h" #endif #endif |