* [PATCH 1/8] gdbserver: Use pattern rule for regformats source file generation
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
2017-03-10 21:23 ` [PATCH 8/8] gdbserver: Use pattern rule for the remaining %-ipa.o objects Simon Marchi
2017-03-10 21:23 ` [PATCH 2/8] gdbserver: Use pattern rule for objects from target/ Simon Marchi
@ 2017-03-10 21:23 ` Simon Marchi
2017-03-10 21:23 ` [PATCH 5/8] gdbserver: Use pattern rule for objects from arch/ Simon Marchi
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in
(%.c: ../regformats/%.dat,
(%.c: ../regformats/arm/%.dat,
(%.c: ../regformats/i386/%.dat,
(%.c: ../regformats/rs6000/%.dat): New rules.
(aarch64.c): Remove.
(reg-arm.c): Remove.
(arm-with-iwmmxt.c): Remove.
(arm-with-vfpv2.c): Remove.
(arm-with-vfpv3.c): Remove.
(arm-with-neon.c): Remove.
(reg-bfin.c): Remove.
(reg-cris.c): Remove.
(reg-crisv32.c): Remove.
(i386.c): Remove.
(i386-linux.c): Remove.
(i386-avx.c): Remove.
(i386-avx-linux.c): Remove.
(i386-avx-avx512.c): Remove.
(i386-avx-avx512-linux.c): Remove.
(i386-mpx.c): Remove.
(i386-mpx-linux.c): Remove.
(i386-avx-mpx-avx512-pku.c): Remove.
(i386-avx-mpx-avx512-pku-linux.c): Remove.
(i386-avx-mpx.c): Remove.
(i386-avx-mpx-linux.c): Remove.
(i386-mmx.c): Remove.
(i386-mmx-linux.c): Remove.
(reg-ia64.c): Remove.
(reg-m32r.c): Remove.
(reg-m68k.c): Remove.
(reg-cf.c): Remove.
(mips-linux.c): Remove.
(mips-dsp-linux.c): Remove.
(mips64-linux.c): Remove.
(mips64-dsp-linux.c): Remove.
(nios2-linux.c): Remove.
(powerpc-32.c): Remove.
(powerpc-32l.c): Remove.
(powerpc-altivec32l.c): Remove.
(powerpc-cell32l.c): Remove.
(powerpc-vsx32l.c): Remove.
(powerpc-isa205-32l.c): Remove.
(powerpc-isa205-altivec32l.c): Remove.
(powerpc-isa205-vsx32l.c): Remove.
(powerpc-e500l.c): Remove.
(powerpc-64l.c): Remove.
(powerpc-altivec64l.c): Remove.
(powerpc-cell64l.c): Remove.
(powerpc-vsx64l.c): Remove.
(powerpc-isa205-64l.c): Remove.
(powerpc-isa205-altivec64l.c): Remove.
(powerpc-isa205-vsx64l.c): Remove.
(s390-linux32.c): Remove.
(s390-linux32v1.c): Remove.
(s390-linux32v2.c): Remove.
(s390-linux64.c): Remove.
(s390-linux64v1.c): Remove.
(s390-linux64v2.c): Remove.
(s390-te-linux64.c): Remove.
(s390-vx-linux64.c): Remove.
(s390-tevx-linux64.c): Remove.
(s390x-linux64.c): Remove.
(s390x-linux64v1.c): Remove.
(s390x-linux64v2.c): Remove.
(s390x-te-linux64.c): Remove.
(s390x-vx-linux64.c): Remove.
(s390x-tevx-linux64.c): Remove.
(tic6x-c64xp-linux.c): Remove.
(tic6x-c64x-linux.c): Remove.
(tic6x-c62x-linux.c): Remove.
(reg-sh.c): Remove.
(reg-sparc64.c): Remove.
(reg-spu.c): Remove.
(amd64.c): Remove.
(amd64-linux.c): Remove.
(amd64-avx.c): Remove.
(amd64-avx-linux.c): Remove.
(amd64-avx-avx512.c): Remove.
(amd64-avx-avx512-linux.c): Remove.
(amd64-mpx.c): Remove.
(amd64-mpx-linux.c): Remove.
(amd64-avx-mpx-avx512-pku.c): Remove.
(amd64-avx-mpx-avx512-pku-linux.c): Remove.
(amd64-avx-mpx.c): Remove.
(amd64-avx-mpx-linux.c): Remove.
(x32.c): Remove.
(x32-linux.c): Remove.
(x32-avx.c): Remove.
(x32-avx-linux.c): Remove.
(x32-avx-avx512.c): Remove.
(x32-avx-avx512-linux.c): Remove.
(reg-xtensa.c): Remove.
(reg-tilegx.c): Remove.
(reg-tilegx32.c): Remove.
---
gdb/gdbserver/Makefile.in | 195 ++++------------------------------------------
1 file changed, 13 insertions(+), 182 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 1cccbbfa66..85138e09c5 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -881,188 +881,19 @@ aarch64-insn.o: ../arch/aarch64-insn.c
$(COMPILE) $<
$(POSTCOMPILE)
-aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c
-reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c
-arm-with-iwmmxt.c : $(srcdir)/../regformats/arm/arm-with-iwmmxt.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-iwmmxt.dat arm-with-iwmmxt.c
-arm-with-vfpv2.c : $(srcdir)/../regformats/arm/arm-with-vfpv2.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-vfpv2.dat arm-with-vfpv2.c
-arm-with-vfpv3.c : $(srcdir)/../regformats/arm/arm-with-vfpv3.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-vfpv3.dat arm-with-vfpv3.c
-arm-with-neon.c : $(srcdir)/../regformats/arm/arm-with-neon.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-neon.dat arm-with-neon.c
-reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c
-reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-cris.dat reg-cris.c
-reg-crisv32.c : $(srcdir)/../regformats/reg-crisv32.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-crisv32.dat reg-crisv32.c
-i386.c : $(srcdir)/../regformats/i386/i386.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386.dat i386.c
-i386-linux.c : $(srcdir)/../regformats/i386/i386-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-linux.dat i386-linux.c
-i386-avx.c : $(srcdir)/../regformats/i386/i386-avx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx.dat i386-avx.c
-i386-avx-linux.c : $(srcdir)/../regformats/i386/i386-avx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-linux.dat i386-avx-linux.c
-i386-avx-avx512.c : $(srcdir)/../regformats/i386/i386-avx-avx512.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-avx512.dat i386-avx-avx512.c
-i386-avx-avx512-linux.c : $(srcdir)/../regformats/i386/i386-avx-avx512-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-avx512-linux.dat i386-avx-avx512-linux.c
-i386-mpx.c : $(srcdir)/../regformats/i386/i386-mpx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-mpx.dat i386-mpx.c
-i386-mpx-linux.c : $(srcdir)/../regformats/i386/i386-mpx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-mpx-linux.dat i386-mpx-linux.c
-i386-avx-mpx-avx512-pku.c : $(srcdir)/../regformats/i386/i386-avx-mpx-avx512-pku.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-mpx-avx512-pku.dat i386-avx-mpx-avx512-pku.c
-i386-avx-mpx-avx512-pku-linux.c : $(srcdir)/../regformats/i386/i386-avx-mpx-avx512-pku-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-mpx-avx512-pku-linux.dat i386-avx-mpx-avx512-pku-linux.c
-i386-avx-mpx.c : $(srcdir)/../regformats/i386/i386-avx-mpx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-mpx.dat i386-avx-mpx.c
-i386-avx-mpx-linux.c : $(srcdir)/../regformats/i386/i386-avx-mpx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-avx-mpx-linux.dat i386-avx-mpx-linux.c
-i386-mmx.c : $(srcdir)/../regformats/i386/i386-mmx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-mmx.dat i386-mmx.c
-i386-mmx-linux.c : $(srcdir)/../regformats/i386/i386-mmx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/i386-mmx-linux.dat i386-mmx-linux.c
-reg-ia64.c : $(srcdir)/../regformats/reg-ia64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-ia64.dat reg-ia64.c
-reg-m32r.c : $(srcdir)/../regformats/reg-m32r.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-m32r.dat reg-m32r.c
-reg-m68k.c : $(srcdir)/../regformats/reg-m68k.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-m68k.dat reg-m68k.c
-reg-cf.c : $(srcdir)/../regformats/reg-cf.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-cf.dat reg-cf.c
-mips-linux.c : $(srcdir)/../regformats/mips-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips-linux.dat mips-linux.c
-mips-dsp-linux.c : $(srcdir)/../regformats/mips-dsp-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips-dsp-linux.dat mips-dsp-linux.c
-mips64-linux.c : $(srcdir)/../regformats/mips64-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips64-linux.dat mips64-linux.c
-mips64-dsp-linux.c : $(srcdir)/../regformats/mips64-dsp-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips64-dsp-linux.dat mips64-dsp-linux.c
-nios2-linux.c : $(srcdir)/../regformats/nios2-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/nios2-linux.dat nios2-linux.c
-powerpc-32.c : $(srcdir)/../regformats/rs6000/powerpc-32.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-32.dat powerpc-32.c
-powerpc-32l.c : $(srcdir)/../regformats/rs6000/powerpc-32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-32l.dat powerpc-32l.c
-powerpc-altivec32l.c : $(srcdir)/../regformats/rs6000/powerpc-altivec32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-altivec32l.dat powerpc-altivec32l.c
-powerpc-cell32l.c : $(srcdir)/../regformats/rs6000/powerpc-cell32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-cell32l.dat powerpc-cell32l.c
-powerpc-vsx32l.c : $(srcdir)/../regformats/rs6000/powerpc-vsx32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-vsx32l.dat powerpc-vsx32l.c
-powerpc-isa205-32l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-32l.dat powerpc-isa205-32l.c
-powerpc-isa205-altivec32l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-altivec32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-altivec32l.dat powerpc-isa205-altivec32l.c
-powerpc-isa205-vsx32l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-vsx32l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-vsx32l.dat powerpc-isa205-vsx32l.c
-powerpc-e500l.c : $(srcdir)/../regformats/rs6000/powerpc-e500l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-e500l.dat powerpc-e500l.c
-powerpc-64l.c : $(srcdir)/../regformats/rs6000/powerpc-64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-64l.dat powerpc-64l.c
-powerpc-altivec64l.c : $(srcdir)/../regformats/rs6000/powerpc-altivec64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-altivec64l.dat powerpc-altivec64l.c
-powerpc-cell64l.c : $(srcdir)/../regformats/rs6000/powerpc-cell64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-cell64l.dat powerpc-cell64l.c
-powerpc-vsx64l.c : $(srcdir)/../regformats/rs6000/powerpc-vsx64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-vsx64l.dat powerpc-vsx64l.c
-powerpc-isa205-64l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-64l.dat powerpc-isa205-64l.c
-powerpc-isa205-altivec64l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-altivec64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-altivec64l.dat powerpc-isa205-altivec64l.c
-powerpc-isa205-vsx64l.c : $(srcdir)/../regformats/rs6000/powerpc-isa205-vsx64l.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-isa205-vsx64l.dat powerpc-isa205-vsx64l.c
-s390-linux32.c : $(srcdir)/../regformats/s390-linux32.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux32.dat s390-linux32.c
-s390-linux32v1.c : $(srcdir)/../regformats/s390-linux32v1.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux32v1.dat s390-linux32v1.c
-s390-linux32v2.c : $(srcdir)/../regformats/s390-linux32v2.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux32v2.dat s390-linux32v2.c
-s390-linux64.c : $(srcdir)/../regformats/s390-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux64.dat s390-linux64.c
-s390-linux64v1.c : $(srcdir)/../regformats/s390-linux64v1.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux64v1.dat s390-linux64v1.c
-s390-linux64v2.c : $(srcdir)/../regformats/s390-linux64v2.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-linux64v2.dat s390-linux64v2.c
-s390-te-linux64.c : $(srcdir)/../regformats/s390-te-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-te-linux64.dat s390-te-linux64.c
-s390-vx-linux64.c : $(srcdir)/../regformats/s390-vx-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-vx-linux64.dat s390-vx-linux64.c
-s390-tevx-linux64.c : $(srcdir)/../regformats/s390-tevx-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390-tevx-linux64.dat s390-tevx-linux64.c
-s390x-linux64.c : $(srcdir)/../regformats/s390x-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-linux64.dat s390x-linux64.c
-s390x-linux64v1.c : $(srcdir)/../regformats/s390x-linux64v1.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-linux64v1.dat s390x-linux64v1.c
-s390x-linux64v2.c : $(srcdir)/../regformats/s390x-linux64v2.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-linux64v2.dat s390x-linux64v2.c
-s390x-te-linux64.c : $(srcdir)/../regformats/s390x-te-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-te-linux64.dat s390x-te-linux64.c
-s390x-vx-linux64.c : $(srcdir)/../regformats/s390x-vx-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-vx-linux64.dat s390x-vx-linux64.c
-s390x-tevx-linux64.c : $(srcdir)/../regformats/s390x-tevx-linux64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/s390x-tevx-linux64.dat s390x-tevx-linux64.c
-
-tic6x-c64xp-linux.c : $(srcdir)/../regformats/tic6x-c64xp-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/tic6x-c64xp-linux.dat tic6x-c64xp-linux.c
-tic6x-c64x-linux.c : $(srcdir)/../regformats/tic6x-c64x-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/tic6x-c64x-linux.dat tic6x-c64x-linux.c
-tic6x-c62x-linux.c : $(srcdir)/../regformats/tic6x-c62x-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/tic6x-c62x-linux.dat tic6x-c62x-linux.c
-
-reg-sh.c : $(srcdir)/../regformats/reg-sh.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-sh.dat reg-sh.c
-reg-sparc64.c : $(srcdir)/../regformats/reg-sparc64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-sparc64.dat reg-sparc64.c
-reg-spu.c : $(srcdir)/../regformats/reg-spu.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-spu.dat reg-spu.c
-amd64.c : $(srcdir)/../regformats/i386/amd64.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64.dat amd64.c
-amd64-linux.c : $(srcdir)/../regformats/i386/amd64-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-linux.dat amd64-linux.c
-amd64-avx.c : $(srcdir)/../regformats/i386/amd64-avx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx.dat amd64-avx.c
-amd64-avx-linux.c : $(srcdir)/../regformats/i386/amd64-avx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-linux.dat amd64-avx-linux.c
-amd64-avx-avx512.c : $(srcdir)/../regformats/i386/amd64-avx-avx512.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-avx512.dat amd64-avx-avx512.c
-amd64-avx-avx512-linux.c : $(srcdir)/../regformats/i386/amd64-avx-avx512-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-avx512-linux.dat amd64-avx-avx512-linux.c
-amd64-mpx.c : $(srcdir)/../regformats/i386/amd64-mpx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-mpx.dat amd64-mpx.c
-amd64-mpx-linux.c : $(srcdir)/../regformats/i386/amd64-mpx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-mpx-linux.dat amd64-mpx-linux.c
-amd64-avx-mpx-avx512-pku.c : $(srcdir)/../regformats/i386/amd64-avx-mpx-avx512-pku.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-mpx-avx512-pku.dat amd64-avx-mpx-avx512-pku.c
-amd64-avx-mpx-avx512-pku-linux.c : $(srcdir)/../regformats/i386/amd64-avx-mpx-avx512-pku-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-mpx-avx512-pku-linux.dat amd64-avx-mpx-avx512-pku-linux.c
-amd64-avx-mpx.c : $(srcdir)/../regformats/i386/amd64-avx-mpx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-mpx.dat amd64-avx-mpx.c
-amd64-avx-mpx-linux.c : $(srcdir)/../regformats/i386/amd64-avx-mpx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/amd64-avx-mpx-linux.dat amd64-avx-mpx-linux.c
-x32.c : $(srcdir)/../regformats/i386/x32.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32.dat x32.c
-x32-linux.c : $(srcdir)/../regformats/i386/x32-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32-linux.dat x32-linux.c
-x32-avx.c : $(srcdir)/../regformats/i386/x32-avx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32-avx.dat x32-avx.c
-x32-avx-linux.c : $(srcdir)/../regformats/i386/x32-avx-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32-avx-linux.dat x32-avx-linux.c
-x32-avx-avx512.c : $(srcdir)/../regformats/i386/x32-avx-avx512.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32-avx-avx512.dat x32-avx-avx512.c
-x32-avx-avx512-linux.c : $(srcdir)/../regformats/i386/x32-avx-avx512-linux.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/i386/x32-avx-avx512-linux.dat x32-avx-avx512-linux.c
-reg-xtensa.c : $(srcdir)/../regformats/reg-xtensa.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-xtensa.dat reg-xtensa.c
-reg-tilegx.c : $(srcdir)/../regformats/reg-tilegx.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-tilegx.dat reg-tilegx.c
-reg-tilegx32.c : $(srcdir)/../regformats/reg-tilegx32.dat $(regdat_sh)
- $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-tilegx32.dat reg-tilegx32.c
+# Rules for register format descriptions.
+
+%.c: ../regformats/%.dat | $(regdat_sh)
+ $(SHELL) $(regdat_sh) $< $@
+
+%.c: ../regformats/arm/%.dat | $(regdat_sh)
+ $(SHELL) $(regdat_sh) $< $@
+
+%.c: ../regformats/i386/%.dat | $(regdat_sh)
+ $(SHELL) $(regdat_sh) $< $@
+
+%.c: ../regformats/rs6000/%.dat | $(regdat_sh)
+ $(SHELL) $(regdat_sh) $< $@
#
# Dependency tracking.
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/8] Use pattern rules in gdbserver's Makefile
@ 2017-03-10 21:23 Simon Marchi
2017-03-10 21:23 ` [PATCH 8/8] gdbserver: Use pattern rule for the remaining %-ipa.o objects Simon Marchi
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
This patch series cleans up gdbserver's Makefile a bit by using pattern rules,
as we did for gdb not so long ago.
Simon Marchi (8):
gdbserver: Use pattern rule for regformats source file generation
gdbserver: Use pattern rule for objects from target/
gdbserver: Use pattern rule for objects from common/
gdbserver: Use pattern rule for objects from nat/
gdbserver: Use pattern rule for objects from arch/
gdbserver: Use pattern rule for IPA objects from gdbserver/
gdbserver: Use pattern rule for IPA objects from common/
gdbserver: Use pattern rule for the remaining %-ipa.o objects
gdb/gdbserver/Makefile.in | 533 ++++------------------------------------------
1 file changed, 38 insertions(+), 495 deletions(-)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/8] gdbserver: Use pattern rule for objects from target/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
2017-03-10 21:23 ` [PATCH 8/8] gdbserver: Use pattern rule for the remaining %-ipa.o objects Simon Marchi
@ 2017-03-10 21:23 ` Simon Marchi
2017-03-10 21:23 ` [PATCH 1/8] gdbserver: Use pattern rule for regformats source file generation Simon Marchi
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%.o: ../target/%.c): New rule.
(waitstatus.o: ../target/waitstatus.c): Remove.
---
gdb/gdbserver/Makefile.in | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 85138e09c5..f814366a01 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -328,10 +328,6 @@ FLAGS_TO_PASS = \
# All generated files which can be included by another file.
generated_files = config.h $(GNULIB_H)
-%.o: %.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
@@ -796,9 +792,6 @@ cleanups.o: ../common/cleanups.c
common-exceptions.o: ../common/common-exceptions.c
$(COMPILE) $<
$(POSTCOMPILE)
-waitstatus.o: ../target/waitstatus.c
- $(COMPILE) $<
- $(POSTCOMPILE)
fileio.o: ../common/fileio.c
$(COMPILE) $<
$(POSTCOMPILE)
@@ -881,6 +874,16 @@ aarch64-insn.o: ../arch/aarch64-insn.c
$(COMPILE) $<
$(POSTCOMPILE)
+# Rules for objects that go in the gdbserver binary.
+
+%.o: %.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
+%.o: ../target/%.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
# Rules for register format descriptions.
%.c: ../regformats/%.dat | $(regdat_sh)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/8] gdbserver: Use pattern rule for objects from common/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (3 preceding siblings ...)
2017-03-10 21:23 ` [PATCH 5/8] gdbserver: Use pattern rule for objects from arch/ Simon Marchi
@ 2017-03-10 21:23 ` Simon Marchi
2017-03-10 21:36 ` [PATCH 4/8] gdbserver: Use pattern rule for objects from nat/ Simon Marchi
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%.o: ../common/%.c): New rule.
(signals.o: ../common/signals.c): Remove.
(print-utils.o: ../common/print-utils.c): Remove.
(rsp-low.o: ../common/rsp-low.c): Remove.
(common-utils.o: ../common/common-utils.c): Remove.
(posix-strerror.o: ../common/posix-strerror.c): Remove.
(mingw-strerror.o: ../common/mingw-strerror.c): Remove.
(vec.o: ../common/vec.c): Remove.
(gdb_vecs.o: ../common/gdb_vecs.c): Remove.
(xml-utils.o: ../common/xml-utils.c): Remove.
(ptid.o: ../common/ptid.c): Remove.
(buffer.o: ../common/buffer.c): Remove.
(format.o: ../common/format.c): Remove.
(filestuff.o: ../common/filestuff.c): Remove.
(agent.o: ../common/agent.c): Remove.
(errors.o: ../common/errors.c): Remove.
(environ.o: ../common/environ.c): Remove.
(common-debug.o: ../common/common-debug.c): Remove.
(cleanups.o: ../common/cleanups.c): Remove.
(common-exceptions.o: ../common/common-exceptions.c): Remove.
(fileio.o: ../common/fileio.c): Remove.
(common-regcache.o: ../common/common-regcache.c): Remove.
(signals-state-save-restore.o: ../common/signals-state-save-restore.c): Remove.
(new-op.o: ../common/new-op.c): Remove.
(btrace-common.o: ../common/btrace-common.c): Remove.
---
gdb/gdbserver/Makefile.in | 77 +++--------------------------------------------
1 file changed, 4 insertions(+), 73 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index f814366a01..2129f2a4d3 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -735,76 +735,6 @@ ax.o: ax.c
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
-signals.o: ../common/signals.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-print-utils.o: ../common/print-utils.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-rsp-low.o: ../common/rsp-low.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-common-utils.o: ../common/common-utils.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-posix-strerror.o: ../common/posix-strerror.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-mingw-strerror.o: ../common/mingw-strerror.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-vec.o: ../common/vec.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-gdb_vecs.o: ../common/gdb_vecs.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-xml-utils.o: ../common/xml-utils.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-ptid.o: ../common/ptid.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-buffer.o: ../common/buffer.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-format.o: ../common/format.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-filestuff.o: ../common/filestuff.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-agent.o: ../common/agent.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-errors.o: ../common/errors.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-environ.o: ../common/environ.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-common-debug.o: ../common/common-debug.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-cleanups.o: ../common/cleanups.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-common-exceptions.o: ../common/common-exceptions.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-fileio.o: ../common/fileio.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-common-regcache.o: ../common/common-regcache.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-signals-state-save-restore.o: ../common/signals-state-save-restore.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-new-op.o: ../common/new-op.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
# Arch object files rules form ../arch
arm.o: ../arch/arm.c
@@ -855,9 +785,6 @@ aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c
aarch64-linux.o: ../nat/aarch64-linux.c
$(COMPILE) $<
$(POSTCOMPILE)
-btrace-common.o: ../common/btrace-common.c
- $(COMPILE) $<
- $(POSTCOMPILE)
x86-linux.o: ../nat/x86-linux.c
$(COMPILE) $<
$(POSTCOMPILE)
@@ -880,6 +807,10 @@ aarch64-insn.o: ../arch/aarch64-insn.c
$(COMPILE) $<
$(POSTCOMPILE)
+%.o: ../common/%.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
%.o: ../target/%.c
$(COMPILE) $<
$(POSTCOMPILE)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 8/8] gdbserver: Use pattern rule for the remaining %-ipa.o objects
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
@ 2017-03-10 21:23 ` Simon Marchi
2017-03-10 21:23 ` [PATCH 2/8] gdbserver: Use pattern rule for objects from target/ Simon Marchi
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%-ipa.o: %-ipa.c): New rule.
(ax-ipa.o: ax.c): Remove.
(linux-i386-ipa.o: linux-i386-ipa.c): Remove.
(linux-amd64-ipa.o: linux-amd64-ipa.c): Remove.
(linux-aarch64-ipa.o: linux-aarch64-ipa.c): Remove.
(linux-s390-ipa.o: linux-s390-ipa.c): Remove.
(linux-ppc-ipa.o: linux-ppc-ipa.c): Remove.
---
gdb/gdbserver/Makefile.in | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 87dbad14f0..9935012eb8 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -540,26 +540,11 @@ IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
-# In-process agent object rules
+# Rules for special cases.
+
ax-ipa.o: ax.c
$(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
-linux-i386-ipa.o: linux-i386-ipa.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-linux-amd64-ipa.o: linux-amd64-ipa.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-linux-aarch64-ipa.o: linux-aarch64-ipa.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-linux-s390-ipa.o: linux-s390-ipa.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-linux-ppc-ipa.o: linux-ppc-ipa.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-
ax.o: ax.c
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
@@ -571,6 +556,17 @@ ax.o: ax.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
+# Note: Between two matching pattern rules, GNU Make 3.81 chooses the first one.
+# Therefore, this one needs to be before "%.o: %.c" for it to be considered for
+# files such as linux-amd64-ipa.o generated from linux-amd64-ipa.c.
+#
+# Later versions of GNU Make choose the rule with the shortest stem, so it would
+# work in any order.
+
+%-ipa.o: %-ipa.c
+ $(IPAGENT_COMPILE) $<
+ $(POSTCOMPILE)
+
%-ipa.o: ../common/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/8] gdbserver: Use pattern rule for objects from arch/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (2 preceding siblings ...)
2017-03-10 21:23 ` [PATCH 1/8] gdbserver: Use pattern rule for regformats source file generation Simon Marchi
@ 2017-03-10 21:23 ` Simon Marchi
2017-03-10 21:23 ` [PATCH 3/8] gdbserver: Use pattern rule for objects from common/ Simon Marchi
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:23 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%.o: ../arch/%.c): New rule.
(arm.o: ../arch/arm.c): Remove.
(arm-linux.o: ../arch/arm-linux.c): Remove.
(arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c): Remove.
(aarch64-insn.o: ../arch/aarch64-insn.c): Remove.
---
gdb/gdbserver/Makefile.in | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index bcf12d017e..3baa96f4a9 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -735,27 +735,13 @@ ax.o: ax.c
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
-# Arch object files rules form ../arch
-
-arm.o: ../arch/arm.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-arm-linux.o: ../arch/arm-linux.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
-# Architecture specific object files rules from ../arch
+# Rules for objects that go in the gdbserver binary.
-aarch64-insn.o: ../arch/aarch64-insn.c
+%.o: %.c
$(COMPILE) $<
$(POSTCOMPILE)
-# Rules for objects that go in the gdbserver binary.
-
-%.o: %.c
+%.o: ../arch/%.c
$(COMPILE) $<
$(POSTCOMPILE)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 6/8] gdbserver: Use pattern rule for IPA objects from gdbserver/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (6 preceding siblings ...)
2017-03-10 21:36 ` [PATCH 7/8] gdbserver: Use pattern rule for IPA objects from common/ Simon Marchi
@ 2017-03-10 21:36 ` Simon Marchi
2017-03-13 19:10 ` [PATCH 0/8] Use pattern rules in gdbserver's Makefile Pedro Alves
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:36 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%-ipa.o: %.c): New rule.
(tracepoint-ipa.o: tracepoint.c): Remove.
(utils-ipa.o: utils.c): Remove.
(remote-utils-ipa.o: remote-utils.c): Remove.
(regcache-ipa.o: regcache.c): Remove.
(i386-linux-ipa.o: i386-linux.c): Remove.
(i386-mmx-linux-ipa.o: i386-mmx-linux.c): Remove.
(i386-avx-linux-ipa.o: i386-avx-linux.c): Remove.
(i386-mpx-linux-ipa.o: i386-mpx-linux.c): Remove.
(i386-avx-mpx-linux-ipa.o: i386-avx-mpx-linux.c): Remove.
(i386-avx-avx512-linux-ipa.o: i386-avx-avx512-linux.c): Remove.
(i386-avx-mpx-avx512-pku-linux-ipa.o: i386-avx-mpx-avx512-pku-linux.c): Remove.
(amd64-linux-ipa.o: amd64-linux.c): Remove.
(amd64-avx-linux-ipa.o: amd64-avx-linux.c): Remove.
(amd64-mpx-linux-ipa.o: amd64-mpx-linux.c): Remove.
(amd64-avx-mpx-linux-ipa.o: amd64-avx-mpx-linux.c): Remove.
(amd64-avx-avx512-linux-ipa.o: amd64-avx-avx512-linux.c): Remove.
(amd64-avx-mpx-avx512-pku-linux-ipa.o: amd64-avx-mpx-avx512-pku-linux.c): Remove.
(aarch64-ipa.o: aarch64.c): Remove.
(s390-linux32-ipa.o: s390-linux32.c): Remove.
(s390-linux32v1-ipa.o: s390-linux32v1.c): Remove.
(s390-linux32v2-ipa.o: s390-linux32v2.c): Remove.
(s390-linux64-ipa.o: s390-linux64.c): Remove.
(s390-linux64v1-ipa.o: s390-linux64v1.c): Remove.
(s390-linux64v2-ipa.o: s390-linux64v2.c): Remove.
(s390-te-linux64-ipa.o: s390-te-linux64.c): Remove.
(s390-vx-linux64-ipa.o: s390-vx-linux64.c): Remove.
(s390-tevx-linux64-ipa.o: s390-tevx-linux64.c): Remove.
(s390x-linux64-ipa.o: s390x-linux64.c): Remove.
(s390x-linux64v1-ipa.o: s390x-linux64v1.c): Remove.
(s390x-linux64v2-ipa.o: s390x-linux64v2.c): Remove.
(s390x-te-linux64-ipa.o: s390x-te-linux64.c): Remove.
(s390x-vx-linux64-ipa.o: s390x-vx-linux64.c): Remove.
(s390x-tevx-linux64-ipa.o: s390x-tevx-linux64.c): Remove.
(powerpc-32l-ipa.o: powerpc-32l.c): Remove.
(powerpc-altivec32l-ipa.o: powerpc-altivec32l.c): Remove.
(powerpc-cell32l-ipa.o: powerpc-cell32l.c): Remove.
(powerpc-vsx32l-ipa.o: powerpc-vsx32l.c): Remove.
(powerpc-isa205-32l-ipa.o: powerpc-isa205-32l.c): Remove.
(powerpc-isa205-altivec32l-ipa.o: powerpc-isa205-altivec32l.c): Remove.
(powerpc-isa205-vsx32l-ipa.o: powerpc-isa205-vsx32l.c): Remove.
(powerpc-e500l-ipa.o: powerpc-e500l.c): Remove.
(powerpc-64l-ipa.o: powerpc-64l.c): Remove.
(powerpc-altivec64l-ipa.o: powerpc-altivec64l.c): Remove.
(powerpc-cell64l-ipa.o: powerpc-cell64l.c): Remove.
(powerpc-vsx64l-ipa.o: powerpc-vsx64l.c): Remove.
(powerpc-isa205-64l-ipa.o: powerpc-isa205-64l.c): Remove.
(powerpc-isa205-altivec64l-ipa.o: powerpc-isa205-altivec64l.c): Remove.
(powerpc-isa205-vsx64l-ipa.o: powerpc-isa205-vsx64l.c): Remove.
(tdesc-ipa.o: tdesc.c): Remove.
(x32-linux-ipa.o: x32-linux.c): Remove.
(x32-avx-linux-ipa.o: x32-avx-linux.c): Remove.
(x32-avx512-linux-ipa.o: x32-avx512-linux.c): Remove.
---
gdb/gdbserver/Makefile.in | 162 ++--------------------------------------------
1 file changed, 6 insertions(+), 156 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 3baa96f4a9..20486112a6 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -544,174 +544,27 @@ IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
ax-ipa.o: ax.c
$(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
-tracepoint-ipa.o: tracepoint.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-utils-ipa.o: utils.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
format-ipa.o: ../common/format.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
common-utils-ipa.o: ../common/common-utils.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-remote-utils-ipa.o: remote-utils.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-regcache-ipa.o: regcache.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-linux-ipa.o: i386-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-mmx-linux-ipa.o: i386-mmx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-avx-linux-ipa.o: i386-avx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-mpx-linux-ipa.o: i386-mpx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-avx-mpx-linux-ipa.o: i386-avx-mpx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-avx-avx512-linux-ipa.o: i386-avx-avx512-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-i386-avx-mpx-avx512-pku-linux-ipa.o: i386-avx-mpx-avx512-pku-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
linux-i386-ipa.o: linux-i386-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
linux-amd64-ipa.o: linux-amd64-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-amd64-linux-ipa.o: amd64-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-amd64-avx-linux-ipa.o: amd64-avx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-amd64-mpx-linux-ipa.o: amd64-mpx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-amd64-avx-mpx-linux-ipa.o: amd64-avx-mpx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-amd64-avx-avx512-linux-ipa.o: amd64-avx-avx512-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-amd64-avx-mpx-avx512-pku-linux-ipa.o: amd64-avx-mpx-avx512-pku-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
linux-aarch64-ipa.o: linux-aarch64-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-aarch64-ipa.o: aarch64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
linux-s390-ipa.o: linux-s390-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-s390-linux32-ipa.o: s390-linux32.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-linux32v1-ipa.o: s390-linux32v1.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-linux32v2-ipa.o: s390-linux32v2.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-linux64-ipa.o: s390-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-linux64v1-ipa.o: s390-linux64v1.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-linux64v2-ipa.o: s390-linux64v2.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-te-linux64-ipa.o: s390-te-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-vx-linux64-ipa.o: s390-vx-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390-tevx-linux64-ipa.o: s390-tevx-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-linux64-ipa.o: s390x-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-linux64v1-ipa.o: s390x-linux64v1.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-linux64v2-ipa.o: s390x-linux64v2.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-te-linux64-ipa.o: s390x-te-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-vx-linux64-ipa.o: s390x-vx-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-s390x-tevx-linux64-ipa.o: s390x-tevx-linux64.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
linux-ppc-ipa.o: linux-ppc-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-powerpc-32l-ipa.o: powerpc-32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-altivec32l-ipa.o: powerpc-altivec32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-cell32l-ipa.o: powerpc-cell32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-vsx32l-ipa.o: powerpc-vsx32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-32l-ipa.o: powerpc-isa205-32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-altivec32l-ipa.o: powerpc-isa205-altivec32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-vsx32l-ipa.o: powerpc-isa205-vsx32l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-e500l-ipa.o: powerpc-e500l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-64l-ipa.o: powerpc-64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-altivec64l-ipa.o: powerpc-altivec64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-cell64l-ipa.o: powerpc-cell64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-vsx64l-ipa.o: powerpc-vsx64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-64l-ipa.o: powerpc-isa205-64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-altivec64l-ipa.o: powerpc-isa205-altivec64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-powerpc-isa205-vsx64l-ipa.o: powerpc-isa205-vsx64l.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-tdesc-ipa.o: tdesc.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
print-utils-ipa.o: ../common/print-utils.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
@@ -721,20 +574,17 @@ rsp-low-ipa.o: ../common/rsp-low.c
errors-ipa.o: ../common/errors.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-x32-linux-ipa.o: x32-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-x32-avx-linux-ipa.o: x32-avx-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-x32-avx512-linux-ipa.o: x32-avx512-linux.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
ax.o: ax.c
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
+# Rules for objects that go in the in-process agent.
+
+%-ipa.o: %.c
+ $(IPAGENT_COMPILE) $<
+ $(POSTCOMPILE)
+
# Rules for objects that go in the gdbserver binary.
%.o: %.c
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 7/8] gdbserver: Use pattern rule for IPA objects from common/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (5 preceding siblings ...)
2017-03-10 21:36 ` [PATCH 4/8] gdbserver: Use pattern rule for objects from nat/ Simon Marchi
@ 2017-03-10 21:36 ` Simon Marchi
2017-03-10 21:36 ` [PATCH 6/8] gdbserver: Use pattern rule for IPA objects from gdbserver/ Simon Marchi
2017-03-13 19:10 ` [PATCH 0/8] Use pattern rules in gdbserver's Makefile Pedro Alves
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:36 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%-ipa.o: ../common/%.c): New rule.
(print-utils-ipa.o: ../common/print-utils.c): Remove.
(rsp-low-ipa.o: ../common/rsp-low.c): Remove.
(errors-ipa.o: ../common/errors.c): Remove.
(format-ipa.o: ../common/format.c): Remove.
(common-utils-ipa.o: ../common/common-utils.c): Remove.
---
gdb/gdbserver/Makefile.in | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 20486112a6..87dbad14f0 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -544,12 +544,6 @@ IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
ax-ipa.o: ax.c
$(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
$(POSTCOMPILE)
-format-ipa.o: ../common/format.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-common-utils-ipa.o: ../common/common-utils.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
linux-i386-ipa.o: linux-i386-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
@@ -565,15 +559,7 @@ linux-s390-ipa.o: linux-s390-ipa.c
linux-ppc-ipa.o: linux-ppc-ipa.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-print-utils-ipa.o: ../common/print-utils.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-rsp-low-ipa.o: ../common/rsp-low.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
-errors-ipa.o: ../common/errors.c
- $(IPAGENT_COMPILE) $<
- $(POSTCOMPILE)
+
ax.o: ax.c
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
@@ -585,6 +571,10 @@ ax.o: ax.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
+%-ipa.o: ../common/%.c
+ $(IPAGENT_COMPILE) $<
+ $(POSTCOMPILE)
+
# Rules for objects that go in the gdbserver binary.
%.o: %.c
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/8] gdbserver: Use pattern rule for objects from nat/
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (4 preceding siblings ...)
2017-03-10 21:23 ` [PATCH 3/8] gdbserver: Use pattern rule for objects from common/ Simon Marchi
@ 2017-03-10 21:36 ` Simon Marchi
2017-03-10 21:36 ` [PATCH 7/8] gdbserver: Use pattern rule for IPA objects from common/ Simon Marchi
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-10 21:36 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdb/gdbserver/ChangeLog:
* Makefile.in (%.o: ../nat/%.c): New rule.
(x86-dregs.o: ../nat/x86-dregs.c): Remove.
(amd64-linux-siginfo.o: ../nat/amd64-linux-siginfo.c): Remove.
(linux-btrace.o: ../nat/linux-btrace.c): Remove.
(linux-osdata.o: ../nat/linux-osdata.c): Remove.
(linux-procfs.o: ../nat/linux-procfs.c): Remove.
(linux-ptrace.o: ../nat/linux-ptrace.c): Remove.
(linux-waitpid.o: ../nat/linux-waitpid.c): Remove.
(mips-linux-watch.o: ../nat/mips-linux-watch.c): Remove.
(ppc-linux.o: ../nat/ppc-linux.c): Remove.
(linux-personality.o: ../nat/linux-personality.c): Remove.
(aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c): Remove.
(aarch64-linux.o: ../nat/aarch64-linux.c): Remove.
(x86-linux.o: ../nat/x86-linux.c): Remove.
(x86-linux-dregs.o: ../nat/x86-linux-dregs.c): Remove.
(linux-namespaces.o: ../nat/linux-namespaces.c): Remove.
---
gdb/gdbserver/Makefile.in | 52 ++++-------------------------------------------
1 file changed, 4 insertions(+), 48 deletions(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 2129f2a4d3..bcf12d017e 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -747,54 +747,6 @@ arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c
$(COMPILE) $<
$(POSTCOMPILE)
-# Native object files rules from ../nat
-
-x86-dregs.o: ../nat/x86-dregs.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-amd64-linux-siginfo.o: ../nat/amd64-linux-siginfo.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-btrace.o: ../nat/linux-btrace.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-osdata.o: ../nat/linux-osdata.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-procfs.o: ../nat/linux-procfs.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-ptrace.o: ../nat/linux-ptrace.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-waitpid.o: ../nat/linux-waitpid.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-mips-linux-watch.o: ../nat/mips-linux-watch.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-ppc-linux.o: ../nat/ppc-linux.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-personality.o: ../nat/linux-personality.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-aarch64-linux.o: ../nat/aarch64-linux.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-x86-linux.o: ../nat/x86-linux.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-x86-linux-dregs.o: ../nat/x86-linux-dregs.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-linux-namespaces.o: ../nat/linux-namespaces.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
# Architecture specific object files rules from ../arch
aarch64-insn.o: ../arch/aarch64-insn.c
@@ -811,6 +763,10 @@ aarch64-insn.o: ../arch/aarch64-insn.c
$(COMPILE) $<
$(POSTCOMPILE)
+%.o: ../nat/%.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
%.o: ../target/%.c
$(COMPILE) $<
$(POSTCOMPILE)
--
2.12.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/8] Use pattern rules in gdbserver's Makefile
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
` (7 preceding siblings ...)
2017-03-10 21:36 ` [PATCH 6/8] gdbserver: Use pattern rule for IPA objects from gdbserver/ Simon Marchi
@ 2017-03-13 19:10 ` Pedro Alves
2017-03-13 22:46 ` Simon Marchi
8 siblings, 1 reply; 11+ messages in thread
From: Pedro Alves @ 2017-03-13 19:10 UTC (permalink / raw)
To: Simon Marchi, gdb-patches
On 03/10/2017 09:23 PM, Simon Marchi wrote:
> gdb/gdbserver/Makefile.in | 533 ++++------------------------------------------
> 1 file changed, 38 insertions(+), 495 deletions(-)
Wheee!
This series is OK.
Thanks much,
Pedro Alves
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/8] Use pattern rules in gdbserver's Makefile
2017-03-13 19:10 ` [PATCH 0/8] Use pattern rules in gdbserver's Makefile Pedro Alves
@ 2017-03-13 22:46 ` Simon Marchi
0 siblings, 0 replies; 11+ messages in thread
From: Simon Marchi @ 2017-03-13 22:46 UTC (permalink / raw)
To: Pedro Alves; +Cc: gdb-patches
On 2017-03-13 15:10, Pedro Alves wrote:
> On 03/10/2017 09:23 PM, Simon Marchi wrote:
>> gdb/gdbserver/Makefile.in | 533
>> ++++------------------------------------------
>> 1 file changed, 38 insertions(+), 495 deletions(-)
>
> Wheee!
>
> This series is OK.
>
> Thanks much,
> Pedro Alves
Thanks, series pushed!
I'll stay here waiting for the breakage reports :).
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-03-13 22:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-10 21:23 [PATCH 0/8] Use pattern rules in gdbserver's Makefile Simon Marchi
2017-03-10 21:23 ` [PATCH 8/8] gdbserver: Use pattern rule for the remaining %-ipa.o objects Simon Marchi
2017-03-10 21:23 ` [PATCH 2/8] gdbserver: Use pattern rule for objects from target/ Simon Marchi
2017-03-10 21:23 ` [PATCH 1/8] gdbserver: Use pattern rule for regformats source file generation Simon Marchi
2017-03-10 21:23 ` [PATCH 5/8] gdbserver: Use pattern rule for objects from arch/ Simon Marchi
2017-03-10 21:23 ` [PATCH 3/8] gdbserver: Use pattern rule for objects from common/ Simon Marchi
2017-03-10 21:36 ` [PATCH 4/8] gdbserver: Use pattern rule for objects from nat/ Simon Marchi
2017-03-10 21:36 ` [PATCH 7/8] gdbserver: Use pattern rule for IPA objects from common/ Simon Marchi
2017-03-10 21:36 ` [PATCH 6/8] gdbserver: Use pattern rule for IPA objects from gdbserver/ Simon Marchi
2017-03-13 19:10 ` [PATCH 0/8] Use pattern rules in gdbserver's Makefile Pedro Alves
2017-03-13 22:46 ` Simon Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).