* Makefile.in (CHILL_FOR_TARGET): Update -L argument to point to

	gcc/ch/runtime not chillrt, since that is where the chill runtime
	lives now.

1 files changed, 36 insertions, 38 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6ee9449..340d23d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -283,7 +283,7 @@ CHILLFLAGS = $(CFLAGS)
 CHILL = gcc
 CHILL_FOR_TARGET = ` \
   if [ -f $${rootme}/../gcc/Makefile ] ; then \
-    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -L$${rootme}/../chillrt/; \
+    echo $${rootme}/../gcc/xgcc -B$${rootme}/../gcc/ -L$${rootme}/../gcc/ch/runtime/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -871,40 +871,40 @@ unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
 
 ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
 	29k-share/udi/udi2go32.c \
-	a29k-pinsn.c a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
+	a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
 	altos-xdep.c arm-convert.s \
-	arm-pinsn.c arm-tdep.c arm-xdep.c coff-solib.c convex-pinsn.c \
+	arm-tdep.c arm-xdep.c coff-solib.c \
 	convex-tdep.c \
 	convex-xdep.c core-sol2.c core-svr4.c coredep.c corelow.c dcache.c \
 	delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
-	go32-xdep.c gould-pinsn.c gould-xdep.c h8300-tdep.c h8500-tdep.c \
-	hp300ux-nat.c hppa-pinsn.c hppa-tdep.c hppab-nat.c hppah-nat.c \
+	go32-xdep.c gould-tdep.c gould-xdep.c h8300-tdep.c h8500-tdep.c \
+	hp300ux-nat.c hppa-tdep.c hppab-nat.c hppah-nat.c \
 	hpread.c \
-	i386-pinsn.c i386-tdep.c i386b-nat.c i386mach-nat.c i386v-nat.c \
+	i386-tdep.c i386b-nat.c i386mach-nat.c i386v-nat.c \
 	i386aix-nat.c i386m3-nat.c i386v4-nat.c i386ly-tdep.c \
 	i387-tdep.c \
-	i960-pinsn.c i960-tdep.c \
+	i960-tdep.c \
 	infptrace.c inftarg.c irix4-nat.c irix5-nat.c isi-xdep.c \
 	lynx-nat.c m3-nat.c \
-	m68k-pinsn.c m68k-tdep.c \
-	m88k-nat.c m88k-pinsn.c m88k-tdep.c mips-nat.c mips-pinsn.c \
+	m68k-tdep.c \
+	m88k-nat.c m88k-tdep.c mips-nat.c \
 	mips-tdep.c mipsm3-nat.c mipsv4-nat.c news-xdep.c \
 	nindy-share/Onindy.c nindy-share/nindy.c \
 	nindy-share/ttyflush.c nindy-tdep.c \
-	ns32k-pinsn.c ns32km3-nat.c osfsolib.c \
+	ns32k-tdep.c ns32km3-nat.c osfsolib.c \
 	somread.c somsolib.c $(HPREAD_SOURCE) \
-	procfs.c pyr-pinsn.c pyr-tdep.c pyr-xdep.c \
+	procfs.c pyr-tdep.c pyr-xdep.c \
 	remote-adapt.c remote-bug.c remote-e7000.c remote-eb.c remote-es.c \
 	remote-hms.c remote-mips.c \
 	remote-mm.c remote-mon.c remote-nindy.c remote-os9k.c remote-sim.c \
 	remote-st.c remote-utils.c dcache.c \
 	remote-udi.c remote-vx.c remote-vx29k.c remote-z8k.c \
-	rs6000-nat.c rs6000-pinsn.c \
-	rs6000-tdep.c ser-go32.c ser-tcp.c sh-tdep.c solib.c sparc-nat.c \
-	sparc-pinsn.c sparc-tdep.c sparcl-tdep.c sun3-nat.c sun386-nat.c \
+	rs6000-nat.c rs6000-tdep.c \
+	ser-go32.c ser-tcp.c sh-tdep.c solib.c sparc-nat.c \
+	sparc-tdep.c sparcl-tdep.c sun3-nat.c sun386-nat.c \
 	symm-tdep.c symm-nat.c \
-	tahoe-pinsn.c ultra3-nat.c ultra3-xdep.c umax-xdep.c \
-	vax-pinsn.c \
+	tahoe-tdep.c ultra3-nat.c ultra3-xdep.c umax-xdep.c \
+	vax-tdep.c \
 	vx-share/xdr_ld.c vx-share/xdr_ptrace.c vx-share/xdr_rdb.c \
 	xcoffread.c xcoffsolib.c z8k-tdep.c
 
@@ -982,8 +982,8 @@ udi2go32.o: $(srcdir)/29k-share/udi/udi2go32.c $(udiheaders)
 udr.o: $(srcdir)/29k-share/udi/udr.c $(udiheaders) 
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udr.c
 
-a29k-pinsn.o: a29k-pinsn.c $(bfd_h) $(dis-asm_h)
 a29k-tdep.o: a29k-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h)
+
 a68v-nat.o: a68v-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 alpha-nat.o: alpha-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
@@ -995,7 +995,7 @@ altos-xdep.o: altos-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 annotate.o: annotate.c $(defs_h) annotate.h $(value_h) target.h $(gdbtypes_h)
 
-arm-pinsn.o: arm-pinsn.c $(OP_INCLUDE)/arm.h $(defs_h) $(symtab_h)
+arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h)
 
 blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	objfiles.h symfile.h target.h
@@ -1047,9 +1047,6 @@ command.o: command.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 
 complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
 
-convex-pinsn.o: convex-pinsn.c $(OP_INCLUDE)/convex.h $(defs_h) \
-	$(symtab_h)
-
 convex-tdep.o: convex-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(inferior_h)
 
@@ -1124,10 +1121,11 @@ gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
 
 go32-xdep.o: go32-xdep.c
 
-gould-pinsn.o: gould-pinsn.c $(OP_INCLUDE)/np1.h $(defs_h) $(frame_h) \
+gould-tdep.o: gould-tdep.c $(OP_INCLUDE)/np1.h $(defs_h) $(frame_h) \
 	$(gdbcore_h) $(symtab_h)
 
 gould-xdep.o: gould-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
+
 h8300-tdep.o: h8300-tdep.c $(defs_h) $(frame_h) $(symtab_h)
 
 h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
@@ -1135,7 +1133,6 @@ h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
 	$(value_h)
 
 hp300ux-nat.o: hp300ux-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
-hppa-pinsn.o: hppa-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
 
 hppa-tdep.o: hppa-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) objfiles.h symfile.h target.h
@@ -1143,14 +1140,19 @@ hppa-tdep.o: hppa-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 hppah-nat.o: hppah-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 
-i386-pinsn.o: i386-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
 i386-tdep.o: i386-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
+
 i386aix-nat.o: i386aix-nat.c $(defs_h) $(frame_h) $(inferior_h) \
 	language.h $(gdbcore_h) $(floatformat_h) target.h
+
 i386b-nat.o: i386b-nat.c $(defs_h) 
+
 i386ly-nat.o: i386ly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
 i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(inferior_h) target.h
+
 i386m3-nat.o: i386m3-nat.c $(defs_h) $(inferior_h) $(floatformat_h) target.h
+
 i386mach-nat.o: i386mach-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) 
 
 i386v-nat.o: i386v-nat.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
@@ -1161,8 +1163,6 @@ i386v4-nat.o: i386v4-nat.c $(defs_h)
 i387-tdep.o: i387-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) language.h
 
-i960-pinsn.o: i960-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
-
 i960-tdep.o: i960-tdep.c $(floatformat_h) $(defs_h) $(expression_h) \
 	$(frame_h) $(gdbtypes_h) $(symtab_h) $(value_h)
 
@@ -1205,11 +1205,12 @@ m2-valprint.o: m2-valprint.c $(defs_h) $(gdbtypes_h) $(symtab_h) \
 m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h target.h \
 	$(wait_h) $(gdbcmd_h) $(gdbcore_h)
 
-m68k-pinsn.o: m68k-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
 m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) 
+
 m68kly-nat.o: m68kly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+
 m88k-nat.o: m88k-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
-m88k-pinsn.o: m88k-pinsn.c $(defs_h) $(symtab_h) 
+
 m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
@@ -1237,7 +1238,6 @@ minsyms.o: minsyms.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
 	$(symtab_h)
 
 mips-nat.o: mips-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) 
-mips-pinsn.o: mips-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h) 
 
 mips-tdep.o: mips-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) language.h objfiles.h symfile.h
@@ -1268,7 +1268,7 @@ ttyflush.o: nindy-share/ttyflush.c
 
 nindy-tdep.o: nindy-tdep.c $(defs_h) $(frame_h) $(symtab_h) 
 
-ns32k-pinsn.o: ns32k-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
+ns32k-tdep.o: ns32k-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h)
 
 objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
 	$(symtab_h)
@@ -1294,10 +1294,8 @@ printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
 procfs.o: procfs.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
 	target.h
 
-pyr-pinsn.o: pyr-pinsn.c $(OP_INCLUDE)/pyr.h $(defs_h) $(gdbcore_h) \
-	$(symtab_h)
-
 pyr-tdep.o: pyr-tdep.c $(defs_h) 
+
 pyr-xdep.o: pyr-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) 
 
 regex.o: regex.c regex.h $(defs_h)
@@ -1368,14 +1366,15 @@ remote.o: remote.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
 
 rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 
-rs6000-pinsn.o: rs6000-pinsn.c $(OP_INCLUDE)/rs6k.h $(defs_h)
-
 rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	target.h xcoffsolib.h
 
 ser-go32.o: ser-go32.c $(defs_h) serial.h 
+
 ser-tcp.o: ser-tcp.c $(defs_h) serial.h signals.h
+
 ser-unix.o: ser-unix.c $(defs_h) serial.h 
+
 serial.o: serial.c $(defs_h) serial.h 
 
 sh-tdep.o: sh-tdep.c $(bfd_h) $(dis-asm_h) \
@@ -1389,7 +1388,6 @@ source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) language.h objfiles.h regex.h symfile.h $(symtab_h)
 
 sparc-nat.o: sparc-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
-sparc-pinsn.o: sparc-pinsn.c $(bfd_h) $(dis-asm_h) $(defs_h)
 
 sparc-tdep.o: sparc-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) objfiles.h symfile.h target.h
@@ -1421,7 +1419,7 @@ symtab.o: symtab.c call-cmds.h $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
 	regex.h symfile.h $(symtab_h) target.h $(value_h)
 
-tahoe-pinsn.o: tahoe-pinsn.c $(OP_INCLUDE)/tahoe.h $(defs_h) \
+tahoe-tdep.o: tahoe-tdep.c $(OP_INCLUDE)/tahoe.h $(defs_h) \
 	$(symtab_h)
 
 target.o: target.c $(bfd_h) $(defs_h) $(gdbcmd_h) $(inferior_h) \
@@ -1452,7 +1450,7 @@ valprint.o: valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 values.o: values.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(gdbtypes_h) $(symtab_h) target.h $(value_h)
 
-vax-pinsn.o: vax-pinsn.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
+vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
 
 w65-tdep.o : w65-tdep.c