在 2022/1/22 下午5:31, Jakub Jelinek 写道:
On Sat, Jan 22, 2022 at 05:05:00PM +0800, Xi Ruoyao wrote:
On Sat, 2022-01-22 at 16:56 +0800, 程璐璐 wrote:
Under the MIPS architecture, *.opt files are also generated in
$(srcdir).
Well, but then you should put the commands for generating those files
into contrib/gcc_update instead of Makefile.in, just like MIPS.
The MIPS does it wrong too. If the generated file is checked into the
tree as in the mips case, such a make rule can be there, but it
should be wrapped with
ifeq($(ENABLE_MAINTAINER_RULES),true)
...
endif
or so.
The point is, when not --enable-maintainer-mode, the gcc tree can be stored
on read-only filesystem.
When adding new CPUs, one just uses --enable-maintainer-mode and regenates
the generated but committed files and commits them together with the
changes.
There are many other examples of such generated files, configure,
Makefile.in from Makefile.am, etc.
Jakub
Hi, Mr Jakub:
I have fixed it, could you please take a look.
diff --git a/contrib/gcc_update b/contrib/gcc_update
index 1cf15f9b3c2..641ce164775 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -86,6 +86,8 @@ gcc/config/arm/arm-tables.opt:
gcc/config/arm/arm-cpus.in gcc/config/arm/parsecp
gcc/config/c6x/c6x-tables.opt: gcc/config/c6x/c6x-isas.def
gcc/config/c6x/genopt.sh
gcc/config/c6x/c6x-sched.md: gcc/config/c6x/c6x-sched.md.in
gcc/config/c6x/gensched.sh
gcc/config/c6x/c6x-mult.md: gcc/config/c6x/c6x-mult.md.in
gcc/config/c6x/genmult.sh
+gcc/config/loongarch/loongarch-str.h:
gcc/config/loongarch/genopts/genstr.sh
gcc/config/loongarch/genopts/loongarch-string
+gcc/config/loongarch/loongarch.opt:
gcc/config/loongarch/genopts/genstr.sh
gcc/config/loongarch/genopts/loongarch.opt.in
gcc/config/m68k/m68k-tables.opt: gcc/config/m68k/m68k-devices.def
gcc/config/m68k/m68k-isas.def gcc/config/m68k/m68k-microarchs.def
gcc/config/m68k/genopt.sh
gcc/config/mips/mips-tables.opt: gcc/config/mips/mips-cpus.def
gcc/config/mips/genopt.sh
gcc/config/rs6000/rs6000-tables.opt: gcc/config/rs6000/rs6000-cpus.def
gcc/config/rs6000/genopt.sh
diff --git a/gcc/config/loongarch/t-loongarch
b/gcc/config/loongarch/t-loongarch
index 6ed1a3ab56a..c106be1ec45 100644
--- a/gcc/config/loongarch/t-loongarch
+++ b/gcc/config/loongarch/t-loongarch
@@ -21,7 +21,15 @@ LA_MULTIARCH_TRIPLET = $(patsubst
LA_MULTIARCH_TRIPLET=%,%,$\
$(filter LA_MULTIARCH_TRIPLET=%,$(tm_defines)))
# String definition header
-LA_STR_H = $(srcdir)/config/loongarch/loongarch-str.h
+$(srcdir)/config/loongarch/loongarch-str.h: s-loongarch-str ; @true
+s-loongarch-str: $(srcdir)/config/loongarch/genopts/genstr.sh \
+ $(srcdir)/config/loongarch/genopts/loongarch-strings
+ $(SHELL) $(srcdir)/config/loongarch/genopts/genstr.sh header \
+ $(srcdir)/config/loongarch/genopts/loongarch-strings > \
+ tmp-loongarch-str.h
+ $(SHELL) $(srcdir)/../move-if-change tmp-loongarch-str.h \
+ $(srcdir)/config/loongarch/loongarch-str.h
+ $(STAMP) s-loongarch-str
loongarch-c.o: $(srcdir)/config/loongarch/loongarch-c.cc $(CONFIG_H)
$(SYSTEM_H) \
coretypes.h $(TM_H) $(TREE_H) output.h $(C_COMMON_H) $(TARGET_H)
@@ -48,12 +56,13 @@ loongarch-cpu.o:
$(srcdir)/config/loongarch/loongarch-cpu.cc $(LA_STR_H)
loongarch-def.o: $(srcdir)/config/loongarch/loongarch-def.c $(LA_STR_H)
$(CC) -c $(ALL_CFLAGS) $(INCLUDES) $<
-$(srcdir)/config/loongarch/loongarch.opt: \
- $(srcdir)/config/loongarch/genopts/genstr.sh \
+$(srcdir)/config/loongarch/loongarch.opt: s-loongarch-opt ; @true
+s-loongarch-opt: $(srcdir)/config/loongarch/genopts/genstr.sh \
$(srcdir)/config/loongarch/genopts/loongarch.opt.in
- $(SHELL) $< opt > $@
+ $(SHELL) $(srcdir)/config/loongarch/genopts/genstr.sh opt \
+ $(srcdir)/config/loongarch/genopts/loongarch.opt.in \
+ > tmp-loongarch.opt
+ $(SHELL) $(srcdir)/../move-if-change tmp-loongarch.opt \
+ $(srcdir)/config/loongarch/loongarch.opt
+ $(STAMP) s-loongarch-opt
-$(LA_STR_H): \
- $(srcdir)/config/loongarch/genopts/genstr.sh \
- $(srcdir)/config/loongarch/genopts/loongarch-strings
- $(SHELL) $< header > $@
