This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
miscellaneous tidy
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Date: Wed, 6 Jul 2005 17:54:45 +0930
- Subject: miscellaneous tidy
Janitorial mostly. The iq2000 change is because otherwise iq2000m.cpu
is included from cgen/cpu/. It would be nicer to somehow tell cgen to
look in cpu/, but my guile knowledge is miniscule so I didn't try for
something more elegant.
bfd/
* po/SRC-POTFILES.in: Add cpu-ms1.c, elf32-ms1.c, elf-vxworks.c,
elfxx-sparc.c.
cpu/
* iq2000.cpu: Include from binutils cpu dir.
opcodes/
* Makefile.am (stamp-m32r): Fix path to cpu files.
(stamp-m32r, stamp-iq2000): Likewise.
* Makefile.in: Regenerate.
* m32r-asm.c: Regenerate.
* po/POTFILES.in: Remove arm-opc.h. Add ms1-asm.c, ms1-desc.c,
ms1-desc.h, ms1-dis.c, ms1-ibld.c, ms1-opc.c, ms1-opc.h.
Index: bfd/po/SRC-POTFILES.in
===================================================================
RCS file: /cvs/src/src/bfd/po/SRC-POTFILES.in,v
retrieving revision 1.32
diff -u -p -r1.32 SRC-POTFILES.in
--- bfd/po/SRC-POTFILES.in 9 Nov 2004 13:29:16 -0000 1.32
+++ bfd/po/SRC-POTFILES.in 6 Jul 2005 03:46:01 -0000
@@ -95,6 +95,7 @@ cpu-maxq.c
cpu-mcore.c
cpu-mips.c
cpu-mmix.c
+cpu-ms1.c
cpu-msp430.c
cpu-ns32k.c
cpu-openrisc.c
@@ -156,6 +157,7 @@ elf32-m68k.c
elf32-m88k.c
elf32-mcore.c
elf32-mips.c
+elf32-ms1.c
elf32-msp430.c
elf32-openrisc.c
elf32-or32.c
@@ -194,7 +196,9 @@ elf-m10200.c
elf-m10300.c
elfn32-mips.c
elf-strtab.c
+elf-vxworks.c
elfxx-mips.c
+elfxx-sparc.c
epoc-pe-arm.c
epoc-pei-arm.c
format.c
Index: cpu/iq2000.cpu
===================================================================
RCS file: /cvs/src/src/cpu/iq2000.cpu,v
retrieving revision 1.3
diff -u -p -r1.3 iq2000.cpu
--- cpu/iq2000.cpu 15 Nov 2004 14:30:12 -0000 1.3
+++ cpu/iq2000.cpu 6 Jul 2005 03:46:07 -0000
@@ -1173,10 +1173,10 @@
(if (keep-mach? (iq2000))
-(include "iq2000m.cpu"))
+(include "../../cpu/iq2000m.cpu"))
(if (keep-mach? (iq10))
-(include "iq10.cpu"))
+(include "../../cpu/iq10.cpu"))
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.am
--- opcodes/Makefile.am 15 Jun 2005 16:23:24 -0000 1.84
+++ opcodes/Makefile.am 6 Jul 2005 03:46:20 -0000
@@ -424,9 +424,10 @@ stamp-ip2k: $(CGENDEPS) $(CPUDIR)/ip2k.c
$(srcdir)/m32r-desc.h $(srcdir)/m32r-desc.c $(srcdir)/m32r-opc.h $(srcdir)/m32r-opc.c $(srcdir)/m32r-ibld.c $(srcdir)/m32r-opinst.c $(srcdir)/m32r-asm.c $(srcdir)/m32r-dis.c: $(M32R_DEPS)
@true
-stamp-m32r: $(CGENDEPS) $(CPUDIR)/m32r.cpu $(CPUDIR)/m32r.opc
+stamp-m32r: $(CGENDEPS) $(srcdir)/../cpu/m32r.cpu $(srcdir)/../cpu/m32r.opc
$(MAKE) run-cgen arch=m32r prefix=m32r options=opinst \
- archfile=$(CPUDIR)/m32r.cpu opcfile=$(CPUDIR)/m32r.opc extrafiles=opinst
+ archfile=$(srcdir)/../cpu/m32r.cpu \
+ opcfile=$(srcdir)/../cpu/m32r.opc extrafiles=opinst
$(srcdir)/fr30-desc.h $(srcdir)/fr30-desc.c $(srcdir)/fr30-opc.h $(srcdir)/fr30-opc.c $(srcdir)/fr30-ibld.c $(srcdir)/fr30-asm.c $(srcdir)/fr30-dis.c: $(FR30_DEPS)
@true
@@ -442,9 +443,10 @@ stamp-frv: $(CGENDEPS) $(srcdir)/../cpu/
$(srcdir)/ms1-desc.h $(srcdir)/ms1-desc.c $(srcdir)/ms1-opc.h $(srcdir)/ms1-opc.c $(srcdir)/ms1-ibld.c $(srcdir)/ms1-asm.c $(srcdir)/ms1-dis.c: $(MS1_DEPS)
@true
-stamp-ms1: $(CGENDEPS) $(CPUDIR)/ms1.cpu $(CPUDIR)/ms1.opc
+stamp-ms1: $(CGENDEPS) $(srcdir)/../cpu/ms1.cpu $(srcdir)/../cpu/ms1.opc
$(MAKE) run-cgen arch=ms1 prefix=ms1 options= \
- archfile=$(CPUDIR)/ms1.cpu opcfile=$(CPUDIR)/ms1.opc extrafiles=
+ archfile=$(srcdir)/../cpu/ms1.cpu \
+ opcfile=$(srcdir)/../cpu/ms1.opc extrafiles=
$(srcdir)/openrisc-desc.h $(srcdir)/openrisc-desc.c $(srcdir)/openrisc-opc.h $(srcdir)/openrisc-opc.c $(srcdir)/openrisc-ibld.c $(srcdir)/openrisc-asm.c $(srcdir)/openrisc-dis.c: $(OPENRISC_DEPS)
@true
@@ -454,10 +456,12 @@ stamp-openrisc: $(CGENDEPS) $(CPUDIR)/op
$(srcdir)/iq2000-desc.h $(srcdir)/iq2000-desc.c $(srcdir)/iq2000-opc.h $(srcdir)/iq2000-opc.c $(srcdir)/iq2000-ibld.c $(srcdir)/iq2000-asm.c $(srcdir)/iq2000-dis.c: $(IQ2000_DEPS)
@true
-stamp-iq2000: $(CGENDEPS) $(CPUDIR)/iq2000.cpu $(CPUDIR)/iq2000.opc \
- $(CPUDIR)/iq2000m.cpu $(CPUDIR)/iq10.cpu
+stamp-iq2000: $(CGENDEPS) $(srcdir)/../cpu/iq2000.cpu \
+ $(srcdir)/../cpu/iq2000.opc $(srcdir)/../cpu/iq2000m.cpu \
+ $(srcdir)/../cpu/iq10.cpu
$(MAKE) run-cgen arch=iq2000 prefix=iq2000 options= \
- archfile=$(CPUDIR)/iq2000.cpu opcfile=$(CPUDIR)/iq2000.opc extrafiles=
+ archfile=$(srcdir)/../cpu/iq2000.cpu \
+ opcfile=$(srcdir)/../cpu/iq2000.opc extrafiles=
$(srcdir)/xstormy16-desc.h $(srcdir)/xstormy16-desc.c $(srcdir)/xstormy16-opc.h $(srcdir)/xstormy16-opc.c $(srcdir)/xstormy16-ibld.c $(srcdir)/xstormy16-asm.c $(srcdir)/xstormy16-dis.c: $(XSTORMY16_DEPS)
@true
Index: opcodes/m32r-asm.c
===================================================================
RCS file: /cvs/src/src/opcodes/m32r-asm.c,v
retrieving revision 1.25
diff -u -p -r1.25 m32r-asm.c
--- opcodes/m32r-asm.c 1 Jul 2005 11:16:32 -0000 1.25
+++ opcodes/m32r-asm.c 6 Jul 2005 03:46:21 -0000
@@ -49,7 +49,6 @@ static const char * parse_insn_normal
/* -- assembler routines inserted here. */
/* -- asm.c */
-
static const char * MISSING_CLOSING_PARENTHESIS = N_("missing `)'");
/* Handle '#' prefixes (i.e. skip over them). */
@@ -120,7 +119,10 @@ parse_hi16 (CGEN_CPU_DESC cd,
handles the case where low() isn't present. */
static const char *
-parse_slo16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)
+parse_slo16 (CGEN_CPU_DESC cd,
+ const char ** strp,
+ int opindex,
+ long * valuep)
{
const char *errmsg;
enum cgen_parse_operand_result result_type;
Index: opcodes/po/POTFILES.in
===================================================================
RCS file: /cvs/src/src/opcodes/po/POTFILES.in,v
retrieving revision 1.30
diff -u -p -r1.30 POTFILES.in
--- opcodes/po/POTFILES.in 19 Nov 2004 12:38:56 -0000 1.30
+++ opcodes/po/POTFILES.in 6 Jul 2005 03:46:21 -0000
@@ -5,7 +5,6 @@ arc-dis.c
arc-ext.c
arc-opc.c
arm-dis.c
-arm-opc.h
avr-dis.c
cgen-asm.c
cgen-dis.c
@@ -96,6 +95,13 @@ mips-dis.c
mips-opc.c
mmix-dis.c
mmix-opc.c
+ms1-asm.c
+ms1-desc.c
+ms1-desc.h
+ms1-dis.c
+ms1-ibld.c
+ms1-opc.c
+ms1-opc.h
ns32k-dis.c
openrisc-asm.c
openrisc-desc.c
--
Alan Modra
IBM OzLabs - Linux Technology Centre