diff --git a/gas/ChangeLog b/gas/ChangeLog
index 89db22020e..d003215373 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* config/tc-i960.c (line_comment_chars): Add '#'.
+	* config/tc-mn10200.c (tc_gen_reloc): Don't ignore fx_subsy.
+
 2003-06-11  H.J. Lu <hongjiu.lu@intel.com>
 
 	* po/Make-in (DESTDIR): New.
diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c
index dab0504787..64981da968 100644
--- a/gas/config/tc-i960.c
+++ b/gas/config/tc-i960.c
@@ -1,6 +1,6 @@
 /* tc-i960.c - All the i80960-specific stuff
    Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002
+   1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
    This file is part of GAS.
@@ -206,7 +206,7 @@ const char comment_chars[] = "#";
 
 /* Also note that comments started like this one will always work.  */
 
-const char line_comment_chars[] = "";
+const char line_comment_chars[] = "#";
 
 const char line_separator_chars[] = ";";
 
diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index ec0a930791..642069493b 100644
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -1,5 +1,5 @@
 /* tc-mn10200.c -- Assembler code for the Matsushita 10200
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -1233,6 +1233,21 @@ tc_gen_reloc (seg, fixp)
   arelent *reloc;
   reloc = (arelent *) xmalloc (sizeof (arelent));
 
+  if (fixp->fx_subsy != NULL)
+    {
+      /* FIXME: We should resolve difference expressions if possible
+	 here.  At least this is better than silently ignoring the
+	 subtrahend.  */
+      as_bad_where (fixp->fx_file, fixp->fx_line,
+		    _("can't resolve `%s' {%s section} - `%s' {%s section}"),
+		    fixp->fx_addsy ? S_GET_NAME (fixp->fx_addsy) : "0",
+		    segment_name (fixp->fx_addsy
+				  ? S_GET_SEGMENT (fixp->fx_addsy)
+				  : absolute_section),
+		    S_GET_NAME (fixp->fx_subsy),
+		    segment_name (S_GET_SEGMENT (fixp->fx_addsy)));
+    }
+
   reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
   if (reloc->howto == (reloc_howto_type *) NULL)
     {