diff options
Diffstat (limited to 'sim/common')
-rw-r--r-- | sim/common/ChangeLog | 4 | ||||
-rw-r--r-- | sim/common/Make-common.in | 30 |
2 files changed, 19 insertions, 15 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index f4225f9..31ac97d 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,9 @@ 2021-04-22 Tom Tromey <tom@tromey.com> + * Make-common.in: Require GNU make. + +2021-04-22 Tom Tromey <tom@tromey.com> + * Make-common.in (stamp-hw): New target. (hw-config.h): Depend on stamp-hw. (mostlyclean): Remove stamp-hw and hw-config.h. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ed3b171..c738014 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -400,21 +400,21 @@ hw_main_headers = \ # simpler scheme. # -@GMAKE_TRUE@ifeq ($(DEPMODE),depmode=gcc3) +ifeq ($(DEPMODE),depmode=gcc3) # Note that we put the dependencies into a .Tpo file, then move them # into place if the compile succeeds. We need this because gcc does # not atomically write the dependency output file. -@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \ -@GMAKE_TRUE@ -MF $(DEPDIR)/$(basename $(@F)).Tpo -@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \ -@GMAKE_TRUE@ $(DEPDIR)/$(basename $(@F)).Po -@GMAKE_TRUE@else -@GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \ -@GMAKE_TRUE@ DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) +override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \ + -MF $(DEPDIR)/$(basename $(@F)).Tpo +override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \ + $(DEPDIR)/$(basename $(@F)).Po +else +override COMPILE.pre = source='$<' object='$@' libtool=no \ + DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC) # depcomp handles atomicity for us, so we don't need a postcompile # step. -@GMAKE_TRUE@override POSTCOMPILE = -@GMAKE_TRUE@endif +override POSTCOMPILE = +endif all_object_files = $(LIB_OBJS) $(SIM_RUN_OBJS) generated_files = \ @@ -427,14 +427,14 @@ generated_files = \ # Ensure that generated files are created early. Use order-only # dependencies if available. They require GNU make 3.80 or newer, # and the .VARIABLES variable was introduced at the same time. -@GMAKE_TRUE@ifdef .VARIABLES -@GMAKE_TRUE@$(all_object_files): | $(generated_files) -@GMAKE_TRUE@else +ifdef .VARIABLES +$(all_object_files): | $(generated_files) +else $(all_object_files) : $(generated_files) -@GMAKE_TRUE@endif +endif # Dependencies. -@GMAKE_TRUE@-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files)) +-include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files)) # FIXME This is one very simple-minded way of generating the file hw-config.h hw-config.h: stamp-hw ; @true |