Skip to content

Commit c26c6bc

Browse files
vapiervapier
committed
sim: ppc: use silent build rules here too
The ppc codebase is unique and doesn't leverage common/, so have to add silent rules to it specifically.
1 parent 5231e3f commit c26c6bc

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

‎sim/ppc/Makefile.in

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ TARGETLIB = libsim.a
141141
all: run$(EXEEXT) $(TARGETLIB) $(GDB_OBJ)
142142

143143
.c.o:
144-
$(CC) -c $(STD_CFLAGS) $<
144+
$(ECHO_CC) $(CC) -c $(STD_CFLAGS) $<
145145

146146

147147
# Headers outside sim/ppc.
@@ -521,16 +521,15 @@ PACKAGE_OBJ = @sim_pk_obj@
521521

522522

523523
psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
524-
$(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
524+
$(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
525525

526526
run$(EXEEXT): psim$(EXEEXT)
527-
rm -f $@
528-
ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
527+
$(SILENCE) rm -f $@
528+
$(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
529529

530530
$(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ)
531-
rm -f $(TARGETLIB)
532-
$(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
533-
$(RANLIB) $(TARGETLIB)
531+
$(ECHO_AR) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
532+
$(ECHO_RANLIB) $(RANLIB) $(TARGETLIB)
534533

535534
psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
536535

@@ -598,43 +597,40 @@ mon.o: mon.c $(BASICS_H) $(CPU_H) $(MON_H)
598597
# GDB after 4.16 expects the default_callback structure to be setup.
599598
# As a kludge, build the common stuff here for now.
600599
gentmap: $(srcdir)/../common/gentmap.c Makefile targ-vals.def
601-
$(LINK_FOR_BUILD) -I. -I../common -I$(srcdir)/../common \
600+
$(ECHO_CCLD) $(LINK_FOR_BUILD) -I. -I../common -I$(srcdir)/../common \
602601
$(srcdir)/../common/gentmap.c -DUSE_CONFIG_H
603602

604603
targ-vals.def: $(srcdir)/../common/nltvals.def
605-
rm -f targ-vals.def tmp-def
606-
cat $(srcdir)/../common/nltvals.def > tmp-vals.def
604+
$(ECHO_GEN) cat $(srcdir)/../common/nltvals.def > tmp-vals.def
607605
$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.def targ-vals.def
608606

609607
targ-vals.h: stamp-vals ; @true
610608
stamp-vals: Makefile gentmap $(srcroot)/move-if-change
611-
rm -f tmp-vals.h
612-
./gentmap -h > tmp-vals.h
609+
$(ECHO_GEN) ./gentmap -h > tmp-vals.h
613610
$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.h targ-vals.h
614-
@echo stamp > stamp-vals
611+
$(SILENCE) touch $@
615612

616613
targ-map.c: stamp-map; @true
617614
stamp-map: Makefile gentmap $(srcroot)/move-if-change
618-
rm -f tmp-map.c
619-
./gentmap -c > tmp-map.c
615+
$(ECHO_GEN) ./gentmap -c > tmp-map.c
620616
$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-map.c targ-map.c
621-
@echo stamp > stamp-map
617+
$(SILENCE) touch $@
622618

623619
callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H)
624-
$(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/callback.c
620+
$(ECHO_CC) $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/callback.c
625621

626622
targ-map.o: targ-map.c $(ANSIDECL_H) $(GDB_CALLBACK_H) $(TARG_VALS_H)
627623

628624
sim-fpu.o: $(srcdir)/../common/sim-fpu.c $(CONFIG_H)
629-
$(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/sim-fpu.c
625+
$(ECHO_CC) $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/sim-fpu.c
630626

631627
# Rebuild options whenever something changes so the date/time is up to date.
632628
options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile
633-
$(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $(srcdir)/options.c
629+
$(ECHO_CC) $(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $(srcdir)/options.c
634630

635631
defines.h: tmp-defines; @true
636632
tmp-defines: config.h Makefile
637-
sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h
633+
$(ECHO_GEN) sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h
638634
$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-defines.h defines.h
639635
$(SILENCE) touch $@
640636

@@ -643,7 +639,7 @@ tmp-defines: config.h Makefile
643639
#
644640

645641
tmp-dgen: dgen ppc-spr-table $(srcroot)/move-if-change
646-
$(DGEN) $(DGEN_FLAGS) \
642+
$(ECHO_GEN) $(DGEN) $(DGEN_FLAGS) \
647643
-r $(srcdir)/ppc-spr-table \
648644
-n spreg.h -hp tmp-spreg.h \
649645
-n spreg.c -p tmp-spreg.c
@@ -652,7 +648,7 @@ tmp-dgen: dgen ppc-spr-table $(srcroot)/move-if-change
652648
$(SILENCE) touch $@
653649

654650
tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.igen $(IGEN_OPCODE_RULES) $(srcroot)/move-if-change tmp-ld-decode tmp-ld-cache tmp-ld-insn tmp-filter
655-
$(IGEN) $(IGEN_FLAGS) \
651+
$(ECHO_GEN) $(IGEN) $(IGEN_FLAGS) \
656652
-o $(srcdir)/$(IGEN_OPCODE_RULES) \
657653
-I $(srcdir) -i $(srcdir)/ppc-instructions \
658654
-n icache.h -hc tmp-icache.h \
@@ -689,77 +685,77 @@ itable.h itable.c icache.h icache.c idecode.h idecode.c semantics.h semantics.c
689685
spreg.h spreg.c: tmp-dgen
690686

691687
dgen: dgen.o table.o lf.o misc.o filter_host.o
692-
$(LINK_FOR_BUILD) dgen.o table.o lf.o misc.o filter_host.o
688+
$(ECHO_CCLD) $(LINK_FOR_BUILD) dgen.o table.o lf.o misc.o filter_host.o
693689

694690
igen: igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o
695-
$(LINK_FOR_BUILD) igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o
691+
$(ECHO_CCLD) $(LINK_FOR_BUILD) igen.o table.o lf.o misc.o filter_host.o ld-decode.o ld-cache.o filter.o ld-insn.o gen-model.o gen-itable.o gen-icache.o gen-semantics.o gen-idecode.o gen-support.o
696692

697693
filter_host.c: filter_filename.c
698-
cat $(srcdir)/filter_filename.c > filter_host.c
694+
$(ECHO_GEN) cat $(srcdir)/filter_filename.c > filter_host.c
699695

700696
filter_host.o: filter_host.c $(CONFIG_H) $(FILTER_FILENAME_H)
701-
$(COMPILE_FOR_BUILD) -c filter_host.c
697+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c filter_host.c
702698

703699
table.o: table.c $(CONFIG_H) $(MISC_H) $(LF_H) $(TABLE_H)
704-
$(COMPILE_FOR_BUILD) -c $(srcdir)/table.c
700+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/table.c
705701

706702
lf.o: lf.c $(CONFIG_H) $(MISC_H) $(LF_H)
707-
$(COMPILE_FOR_BUILD) -c $(srcdir)/lf.c
703+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/lf.c
708704

709705
filter.o: filter.c $(CONFIG_H) $(MISC_H) $(FILTER_H)
710-
$(COMPILE_FOR_BUILD) -c $(srcdir)/filter.c
706+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/filter.c
711707
tmp-filter: filter.c $(MISC_H) misc.o
712-
$(LINK_FOR_BUILD) -DMAIN $(srcdir)/filter.c misc.o
708+
$(ECHO_CCLD) $(LINK_FOR_BUILD) -DMAIN $(srcdir)/filter.c misc.o
713709

714710
ld-decode.o: ld-decode.c $(MISC_H) $(LF_H) $(TABLE_H) $(LD_DECODE_H)
715-
$(COMPILE_FOR_BUILD) -c $(srcdir)/ld-decode.c
711+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-decode.c
716712
tmp-ld-decode: ld-decode.c misc.o lf.o table.o filter_host.o
717-
$(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-decode.c misc.o lf.o table.o filter_host.o
713+
$(ECHO_CCLD) $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-decode.c misc.o lf.o table.o filter_host.o
718714

719715
ld-cache.o: ld-cache.c $(MISC_H) $(LF_H) $(TABLE_H) $(LD_CACHE_H)
720-
$(COMPILE_FOR_BUILD) -c $(srcdir)/ld-cache.c
716+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-cache.c
721717
tmp-ld-cache: ld-cache.c misc.o lf.o table.o filter_host.o
722-
$(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-cache.c misc.o lf.o table.o filter_host.o
718+
$(ECHO_CCLD) $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-cache.c misc.o lf.o table.o filter_host.o
723719

724720
ld-insn.o: ld-insn.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H)
725-
$(COMPILE_FOR_BUILD) -c $(srcdir)/ld-insn.c
721+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/ld-insn.c
726722
tmp-ld-insn: ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o
727-
$(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o
723+
$(ECHO_CCLD) $(LINK_FOR_BUILD) -DMAIN $(srcdir)/ld-insn.c ld-cache.o misc.o lf.o table.o ld-decode.o filter_host.o filter.o
728724

729725
gen-model.o: gen-model.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(GEN_MODEL_H)
730-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-model.c
726+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-model.c
731727

732728
gen-itable.o: gen-itable.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_ITABLE_H)
733-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-itable.c
729+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-itable.c
734730

735731
gen-icache.o: gen-icache.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_IDECODE_H) $(GEN_ICACHE_H)
736-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-icache.c
732+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-icache.c
737733

738734
gen-semantics.o: gen-semantics.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_ICACHE_H) $(GEN_IDECODE_H)
739-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-semantics.c
735+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-semantics.c
740736

741737
gen-idecode.o: gen-idecode.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_IDECODE_H) $(GEN_ICACHE_H) $(GEN_SEMANTICS_H)
742-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-idecode.c
738+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-idecode.c
743739

744740
gen-support.o: gen-support.c $(MISC_H) $(LF_H) $(TABLE_H) $(FILTER_H) $(LD_DECODE_H) $(LD_CACHE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_SEMANTICS_H) $(GEN_SUPPORT_H)
745-
$(COMPILE_FOR_BUILD) -c $(srcdir)/gen-support.c
741+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/gen-support.c
746742

747743
dgen.o: dgen.c $(CONFIG_H) $(MISC_H) $(LF_H) $(TABLE_H)
748-
$(COMPILE_FOR_BUILD) -c $(srcdir)/dgen.c
744+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/dgen.c
749745

750746
igen.o: igen.c $(MISC_H) $(LF_H) $(TABLE_H) $(CONFIG_H) $(FILTER_H) $(LD_CACHE_H) $(LD_DECODE_H) $(LD_INSN_H) $(IGEN_H) $(GEN_MODEL_H) $(GEN_ICACHE_H) $(GEN_ITABLE_H) $(GEN_IDECODE_H) $(GEN_SEMANTICS_H) $(GEN_SUPPORT_H)
751-
$(COMPILE_FOR_BUILD) -c $(srcdir)/igen.c
747+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/igen.c
752748

753749
misc.o: misc.c $(CONFIG_H) $(MISC_H)
754-
$(COMPILE_FOR_BUILD) -c $(srcdir)/misc.c
750+
$(ECHO_CC) $(COMPILE_FOR_BUILD) -c $(srcdir)/misc.c
755751

756752

757753

758754
# real hardware
759755
hw.c hw.h: tmp-hw; @true
760756
tmp-hw: Makefile $(HW_SRC) $(srcroot)/move-if-change
761-
# The first for loop is to remove duplicates.
762-
f=""; \
757+
$(ECHO_GEN)# The first for loop is to remove duplicates.
758+
$(SILENCE) f=""; \
763759
for i in $(HW_SRC) ; do \
764760
case " $$f " in \
765761
*" $$i "*) ;; \
@@ -771,7 +767,7 @@ tmp-hw: Makefile $(HW_SRC) $(srcroot)/move-if-change
771767
-e 's/^/extern const device_descriptor /' \
772768
-e 's/$$/_device_descriptor\[\];/' \
773769
> tmp-hw.h
774-
f=""; \
770+
$(SILENCE) f=""; \
775771
for i in $(HW_SRC) ; do \
776772
case " $$f " in \
777773
*" $$i "*) ;; \
@@ -814,8 +810,8 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H)
814810
# real packages
815811
pk.h: tmp-pk; @true
816812
tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change
817-
# The first for loop is to remove duplicates.
818-
f=""; \
813+
$(ECHO_GEN)# The first for loop is to remove duplicates.
814+
$(SILENCE) f=""; \
819815
for i in $(PACKAGE_SRC) ; do \
820816
case " $$f " in \
821817
*" $$i "*) ;; \

‎sim/ppc/dgen.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,9 @@ main(int argc,
286286

287287

288288
while ((ch = getopt(argc, argv, "hLsn:r:p:")) != -1) {
289+
#if 0 /* For debugging. */
289290
fprintf(stderr, "\t-%c %s\n", ch, ( optarg ? optarg : ""));
291+
#endif
290292
switch(ch) {
291293
case 's':
292294
spreg_lookup_table = 0;

‎sim/ppc/igen.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,9 @@ main(int argc,
393393
while ((ch = getopt(argc, argv,
394394
"F:EI:RSLJT:CB:H:N:o:k:i:n:hc:d:m:s:t:f:"))
395395
!= -1) {
396+
#if 0 /* For debugging. */
396397
fprintf(stderr, "\t-%c %s\n", ch, (optarg ? optarg : ""));
398+
#endif
397399
switch(ch) {
398400
case 'C':
399401
code |= generate_with_icache;

0 commit comments

Comments
 (0)