From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15879 invoked by alias); 15 May 2003 03:27:03 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 15742 invoked from network); 15 May 2003 03:26:58 -0000 Received: from unknown (63.201.54.26) by sources.redhat.com with QMTP; 15 May 2003 03:26:58 -0000 Received: (qmail 31988 invoked by uid 10); 15 May 2003 03:26:57 -0000 Received: (qmail 20224 invoked by uid 500); 15 May 2003 03:26:53 -0000 Message-ID: <20030515032653.20223.qmail@gossamer.airs.com> Date: Thu, 15 May 2003 03:27:00 -0000 From: Ian Lance Taylor To: gdb-patches@sources.redhat.com CC: ian@airs.com Subject: [PATCH/RFA] Always use $(SHELL) when invoking move-if-change X-SW-Source: 2003-05/txt/msg00236.txt.bz2 Since move-if-change is a shell script, Makefiles should always use $(SHELL) when they invoke it. There are a few cases in sim which do not do this. Here is a patch. Is this OK to check in? Ian sim/mips/ChangeLog: 2003-05-14 Ian Lance Taylor * Makefile.in (SHELL): Make sure this is defined. (various): Use $(SHELL) whenever we invoke move-if-change. sim/ppc/ChangeLog: 2003-05-14 Ian Lance Taylor * Makefile.in (various): Use $(SHELL) whenever we invoke move-if-change. sim/v850/ChangeLog: 2003-05-14 Ian Lance Taylor * Makefile.in (SHELL): Make sure this is defined. (tmp-igen): Use $(SHELL) whenever we invoke move-if-change. Index: mips/Makefile.in =================================================================== RCS file: /cvs/src/src/sim/mips/Makefile.in,v retrieving revision 1.9 diff -u -r1.9 Makefile.in --- mips/Makefile.in 6 Jan 2003 01:57:40 -0000 1.9 +++ mips/Makefile.in 15 May 2003 03:20:55 -0000 @@ -1,6 +1,8 @@ # Makefile template for Configure for the MIPS simulator. # Written by Cygnus Support. +SHELL = @SHELL@ + ## COMMON_PRE_CONFIG_FRAG srcdir=@srcdir@ @@ -155,21 +157,21 @@ -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c + $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c touch tmp-igen semantics.o: sim-main.h semantics.c $(SIM_EXTRA_DEPS) @@ -233,16 +235,16 @@ -n m16_support.h -hf tmp-support.h \ -n m16_support.c -f tmp-support.c \ # - $(srcdir)/../../move-if-change tmp-icache.h m16_icache.h - $(srcdir)/../../move-if-change tmp-icache.c m16_icache.c - $(srcdir)/../../move-if-change tmp-idecode.h m16_idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c m16_idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h m16_semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c m16_semantics.c - $(srcdir)/../../move-if-change tmp-model.h m16_model.h - $(srcdir)/../../move-if-change tmp-model.c m16_model.c - $(srcdir)/../../move-if-change tmp-support.h m16_support.h - $(srcdir)/../../move-if-change tmp-support.c m16_support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m16_icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m16_icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m16_idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m16_idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h m16_semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c m16_semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m16_model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m16_model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m16_support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m16_support.c ../igen/igen \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -268,16 +270,16 @@ -n m32_support.h -hf tmp-support.h \ -n m32_support.c -f tmp-support.c \ # - $(srcdir)/../../move-if-change tmp-icache.h m32_icache.h - $(srcdir)/../../move-if-change tmp-icache.c m32_icache.c - $(srcdir)/../../move-if-change tmp-idecode.h m32_idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c m32_idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h m32_semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c m32_semantics.c - $(srcdir)/../../move-if-change tmp-model.h m32_model.h - $(srcdir)/../../move-if-change tmp-model.c m32_model.c - $(srcdir)/../../move-if-change tmp-support.h m32_support.h - $(srcdir)/../../move-if-change tmp-support.c m32_support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m32_icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m32_icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m32_idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m32_idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h m32_semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c m32_semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m32_model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m32_model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m32_support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m32_support.c ../igen/igen \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -291,8 +293,8 @@ -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c touch tmp-m16 @@ -336,18 +338,18 @@ -n $${p}_engine.h -he tmp-engine.h \ -n $${p}_engine.c -e tmp-engine.c \ ; \ - $(srcdir)/../../move-if-change tmp-icache.h $${p}_icache.h ; \ - $(srcdir)/../../move-if-change tmp-icache.c $${p}_icache.c ; \ - $(srcdir)/../../move-if-change tmp-idecode.h $${p}_idecode.h ; \ - $(srcdir)/../../move-if-change tmp-idecode.c $${p}_idecode.c ; \ - $(srcdir)/../../move-if-change tmp-semantics.h $${p}_semantics.h ; \ - $(srcdir)/../../move-if-change tmp-semantics.c $${p}_semantics.c ; \ - $(srcdir)/../../move-if-change tmp-model.h $${p}_model.h ; \ - $(srcdir)/../../move-if-change tmp-model.c $${p}_model.c ; \ - $(srcdir)/../../move-if-change tmp-support.h $${p}_support.h ; \ - $(srcdir)/../../move-if-change tmp-support.c $${p}_support.c ; \ - $(srcdir)/../../move-if-change tmp-engine.h $${p}_engine.h ; \ - $(srcdir)/../../move-if-change tmp-engine.c $${p}_engine.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h $${p}_icache.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c $${p}_icache.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h $${p}_idecode.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c $${p}_idecode.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h $${p}_semantics.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c $${p}_semantics.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h $${p}_model.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c $${p}_model.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h $${p}_support.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c $${p}_support.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h $${p}_engine.h ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c $${p}_engine.c ; \ done touch tmp-mach-multi tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) @@ -365,8 +367,8 @@ -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c touch tmp-itable-multi tmp-run-multi: $(srcdir)/m16run.c for t in $(SIM_MULTI_IGEN_CONFIGS); do \ @@ -377,7 +379,7 @@ -e "s/^sim_/m16$${m}_/" \ -e "s/m16_/m16$${m}_/" \ -e "s/m32_/m32$${m}_/" ; \ - $(srcdir)/../../move-if-change tmp-run m16$${m}_run.c ; \ + $(SHELL) $(srcdir)/../../move-if-change tmp-run m16$${m}_run.c ; \ esac \ done touch tmp-run-multi Index: ppc/Makefile.in =================================================================== RCS file: /cvs/src/src/sim/ppc/Makefile.in,v retrieving revision 1.6 diff -u -r1.6 Makefile.in --- ppc/Makefile.in 22 Jun 2002 19:10:34 -0000 1.6 +++ ppc/Makefile.in 15 May 2003 03:20:56 -0000 @@ -413,17 +413,17 @@ targ-vals.def: $(srcdir)/../common/nltvals.def rm -f targ-vals.def tmp-def cat $(srcdir)/../common/nltvals.def > tmp-vals.def - $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def + $(SHELL) $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def targ-vals.h: Makefile gentmap $(srcdir)/../../move-if-change rm -f tmp-vals.h ./gentmap -h > tmp-vals.h - $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h + $(SHELL) $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h targ-map.c: Makefile gentmap $(srcdir)/../../move-if-change rm -f tmp-map.c ./gentmap -c > tmp-map.c - $(srcdir)/../../move-if-change tmp-map.c targ-map.c + $(SHELL) $(srcdir)/../../move-if-change tmp-map.c targ-map.c callback.o: ../common/callback.c targ-vals.h config.h $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $< @@ -443,7 +443,7 @@ tmp-defines: config.h Makefile sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h - $(srcdir)/../../move-if-change tmp-defines.h defines.h + $(SHELL) $(srcdir)/../../move-if-change tmp-defines.h defines.h touch tmp-defines # @@ -459,8 +459,8 @@ -r $(srcdir)/ppc-spr-table \ -n spreg.h -hp tmp-spreg.h \ -n spreg.c -p tmp-spreg.c - $(srcdir)/../../move-if-change tmp-spreg.h spreg.h - $(srcdir)/../../move-if-change tmp-spreg.c spreg.c + $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.h spreg.h + $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.c spreg.c touch tmp-dgen @@ -481,18 +481,18 @@ -n model.c -m tmp-model.c \ -n support.h -hf tmp-support.h \ -n support.c -f tmp-support.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c touch tmp-igen # NOTE: Some versions of make don't handle files created as side-effects @@ -596,8 +596,8 @@ -e 's/^/ /' \ -e 's/$$/_device_descriptor,/' \ > tmp-hw.c - $(srcdir)/../../move-if-change tmp-hw.h hw.h - $(srcdir)/../../move-if-change tmp-hw.c hw.c + $(SHELL) $(srcdir)/../../move-if-change tmp-hw.h hw.h + $(SHELL) $(srcdir)/../../move-if-change tmp-hw.c hw.c touch tmp-hw hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H) $(CPU_H) @@ -635,7 +635,7 @@ -e 's/^/extern package_create_instance_callback pk_/' \ -e 's/$$/_create_instance;/' \ > tmp-pk.h - $(srcdir)/../../move-if-change tmp-pk.h pk.h + $(SHELL) $(srcdir)/../../move-if-change tmp-pk.h pk.h touch tmp-pk pk_disklabel.o: pk.h $(DEVICE_TABLE_H) Index: v850/Makefile.in =================================================================== RCS file: /cvs/src/src/sim/v850/Makefile.in,v retrieving revision 1.6 diff -u -r1.6 Makefile.in --- v850/Makefile.in 29 Aug 2002 16:59:20 -0000 1.6 +++ v850/Makefile.in 15 May 2003 03:20:57 -0000 @@ -16,6 +16,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +SHELL = @SHELL@ + ## COMMON_PRE_CONFIG_FRAG SIM_OBJS = \ @@ -101,21 +103,21 @@ -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(srcdir)/../../move-if-change tmp-model.h model.h - $(srcdir)/../../move-if-change tmp-model.c model.c - $(srcdir)/../../move-if-change tmp-support.h support.h - $(srcdir)/../../move-if-change tmp-support.c support.c - $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h + $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h + $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h + $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c + $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h + $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c + $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h + $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h + $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h + $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c + $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c touch tmp-igen clean-extra: clean-igen