* frags.c (frag_var): fr_pcrel_adjust renamed to

	fr_targ.ns32k.pcrel_adjust.  fr_bsr renamed to fr_targ.ns32k.bsr.
	(frag_variant): Likewise.
	* Makefile.in: Tweak last entry, cgen.o is in extra_objects!

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 855a4ccbef971990307cc6fe5f109b98e58a3fa0..2528b1646797787578edf22e64d42aaad0982fef 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -3,10 +3,8 @@ Fri Apr  4 16:10:02 1997  Doug Evans  <dje@canuck.cygnus.com>
        * config/tc-m32r.[ch]: New files.
        * cgen.c: New file.
        * Makefile.in (CPU_TYPES): Add m32r.
-       (CFILES): Add cgen.c.
        (TARGET_CPU_CFILES): Add tc-m32r.c.
        (TARGET_CPU_HFILES): Add tc-m32r.h.
-       (OBJS): Add cgen.o.
        (DISTCLEAN_HERE): Add cgen-opc.h.
        (.dep1,.tcdep): Create empty cgen-opc.h.
        (cgen.o): Add dependencies.
@@ -15,11 +13,13 @@ Fri Apr  4 16:10:02 1997  Doug Evans  <dje@canuck.cygnus.com>
        (fr_pcrel_adjust,fr_bsr): Move into union fr_targ.ns32k.
        * conf.in (USING_CGEN): New macro.
        * configure.in (m32r-*-*): Add entry for.
+       Add cgen.o to extra_objects.  Create cgen-opc.h symlink.
        * configure: Regenerate.
-       * write.c (relax_frag): fr_pcrel_adjust renamed to
-       fr_targ.ns32k.pcrel_adjust.
+       * frags.c (frag_var): fr_pcrel_adjust renamed to
+       fr_targ.ns32k.pcrel_adjust.  fr_bsr renamed to fr_targ.ns32k.bsr.
+       (frag_variant): Likewise.
+       * write.c (relax_frag): Likewise.
        * config/tc-ns32k.c (*): Likewise.
-       fr_bsr renamed to fr_targ.ns32k.bsr.
 
 Fri Apr  4 13:26:10 1997  Ian Lance Taylor  <ian@cygnus.com>
 

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 5d93753f1d8539cf029998182f5aad650632a551..e42fec028f174dbc4545310fd4136d680488809d 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -221,7 +221,6 @@ CFILES = \
        as.c \
        atof-generic.c \
        bignum-copy.c \
-       cgen.c \
        cond.c \
        ecoff.c \
        expr.c \
@@ -402,7 +401,6 @@ OBJS = \
        as.o \
        atof-generic.o \
        bignum-copy.o \
-       cgen.o \
        cond.o \
        expr.o \
        flonum-konst.o \
@@ -643,6 +641,10 @@ IT_TEST_OBJS= itbl-parse.o itbl-lex.o itbl-test-ops.o
 itbl-test: $(IT_TEST_OBJS) itbl-test.o $(LIBDEPS)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o itbl-test itbl-test.o $(IT_TEST_OBJS) $(LIBS)
 
+# CGEN interface.
+
+cgen.o: cgen.c cgen-opc.h subsegs.h $(INCDIR)/obstack.h
+
 # Remake the info files.
 
 doc: $(srcdir)/as.info
@@ -984,7 +986,6 @@ as.o: as.c subsegs.h $(INCDIR)/obstack.h output-file.h \
   sb.h macro.h
 atof-generic.o: atof-generic.c
 bignum-copy.o: bignum-copy.c
-cgen.o: cgen.c cgen-opc.h subsegs.h $(INCDIR)/obstack.h
 cond.o: cond.c $(INCDIR)/obstack.h
 ecoff.o: ecoff.c
 expr.o: expr.c $(INCDIR)/obstack.h