diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0852af5227..ef413131f4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+Tue Jan  4 15:12:43 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* Makefile.in (INCLUDES): Add $(srcdir)/.. to places to search.
+	* config/obj-ecoff.c: Include files as "bfd/" instead of "../bfd/".
+	* app.c, flonum.h, hex-value.c (const): Change #if to be more
+	portable.
+
+Thu Dec 30 15:27:16 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* write.c (write_relocs): bfd_perform_relocation now takes an
+	additional argument, to return an error string (which we ignore).
+
 Wed Dec 29 14:37:26 1993  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
 	* write.h (struct fix): Field tc_fix_data should be type PTR, not
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 460ba8570f..60e575be52 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -124,12 +124,14 @@ FLAGS_TO_PASS = \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)"
 
+RUNTEST=runtest
 CHECKFLAGS= \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
-	"RUNTEST_FLAGS=$(RUNTEST_FLAGS)"
+	"RUNTEST_FLAGS=$(RUNTEST_FLAGS)" \
+	"RUNTEST=$(RUNTEST)"
 
 # Lists of files for various purposes.
 
@@ -251,7 +253,7 @@ LIBS = ../opcodes/libopcodes.a $(BFDLIB) $(LOCAL_LOADLIBES) \
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(srcdir)/../include
+INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(srcdir)/../include -I$(srcdir)/..
 SUBDIR_INCLUDES = -I.. -I$(srcdir) -I$(srcdir)/config
 
 # Always use -I$(srcdir)/config when compiling.
@@ -398,7 +400,7 @@ $(srcdir)/as.info: $(srcdir)/doc/as.texinfo
 clean-here:
 	-rm -f $(STAGESTUFF) core
 
-clean:
+clean: clean-here
 	@cd doc ; $(MAKE) $(FLAGS_TO_PASS) clean
 	@if [ -d testsuite ] ; then \
 	  cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) clean ; \
diff --git a/gas/app.c b/gas/app.c
index 1317c80623..9ed97ebdca 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -1,5 +1,5 @@
 /* This is the Assembler Pre-Processor
-   Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1991, 1992, 1994 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -27,8 +27,10 @@
 #include <stdio.h>
 #include "as.h"			/* For BAD_CASE() only */
 
-#if (__STDC__ != 1) && !defined(const)
-#define const			/* Nothing */
+#if (__STDC__ != 1)
+#ifndef const
+#define const  /* empty */
+#endif
 #endif
 
 static char lex[256];
@@ -447,6 +449,10 @@ recycle:
 	  not_cpp_line = 1;
 	  goto recycle;
 	}
+#ifdef MRI
+      (*unget) (ch);		/* Put back */
+      return ' ';		/* Always return one space at start of line */
+#endif
 
       /* If we're in state 2, we've seen a non-white
 	 character followed by whitespace.  If the next
@@ -458,29 +464,6 @@ recycle:
 	  return ch;
 	}
 
-#if defined (LABELS_WITHOUT_COLONS) || defined (MRI)
-      /* Like above, but handles case where labels are not
-	 required to have colons (and therefore must be identified
-	 by their *position* in the input stream.)  For a testcase
-	 see hppa/more.parse/labelbug.s.
-
-	 This also has the effect of sometimes leaving a whitespace
-	 before a newline.  Instead of trying to rework this horribly
-	 broken and hairy code I'm just going to zap the extra space here.  */
-      if (state == 2 && lex[ch] == LEX_IS_SYMBOL_COMPONENT)
-	{
-	  (*unget) (ch);
-	  return ' ';
-	}
-
-      /* Don't emit a space before a newline.  */
-      if (state == 2 && lex[ch] == LEX_IS_NEWLINE)
-	{
-	  state = 0;
-	  return ch;
-	}
-#endif
-
       switch (state)
 	{
 	case 0:
diff --git a/gas/config/obj-ecoff.c b/gas/config/obj-ecoff.c
index 7d997a42f8..8426c7a116 100644
--- a/gas/config/obj-ecoff.c
+++ b/gas/config/obj-ecoff.c
@@ -1,5 +1,5 @@
 /* ECOFF object file format.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    This file was put together by Ian Lance Taylor <ian@cygnus.com>.
 
@@ -21,8 +21,8 @@
 
 #include "as.h"
 #include "coff/internal.h"
-#include "../bfd/libcoff.h"
-#include "../bfd/libecoff.h"
+#include "bfd/libcoff.h"
+#include "bfd/libecoff.h"
 
 /* Almost all of the ECOFF support is actually in ecoff.c in the main
    gas directory.  This file mostly just arranges to call that one at
@@ -156,9 +156,6 @@ ecoff_frob_file ()
 				  (file_ptr) 0, sizeof s) == false)
       as_fatal ("Can't write REGINFO section");
   }
-
-  bfd_set_symtab (stdoutput, bfd_get_outsymbols (stdoutput),
-		  (unsigned int) (hdr->isymMax + hdr->iextMax));
 }
 
 /* This is called by the ECOFF code to set the external information
diff --git a/gas/hex-value.c b/gas/hex-value.c
index 30a1fc5d8f..a808377b36 100644
--- a/gas/hex-value.c
+++ b/gas/hex-value.c
@@ -1,5 +1,5 @@
 /* hex_value.c - char=>radix-value -
-   Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1991, 1992, 1994 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -25,9 +25,12 @@
 #define __ (42)			/* blatently illegal digit value */
 /* exceeds any normal radix */
 
-#if (__STDC__ != 1) && !defined(const)
-#define const			/* empty */
+#if (__STDC__ != 1)
+#ifndef const
+#define const  /* empty */
 #endif
+#endif
+
 const char
   hex_value[256] =
 {				/* for fast ASCII -> binary */