2000-09-05 Eric Christopher <echristo@cygnus.com>

* config/tc-mn10300.c: Cleanup.
	(md_pcrel_from): Enable.

gas/ChangeLog

@@ -1,3 +1,8 @@
+2000-09-05  Eric Christopher  <echristo@cygnus.com>
+
+	* config/tc-mn10300.c: Cleanup.
+	(md_pcrel_from): Enable.
+
 2000-09-05  Alan Modra  <alan@linuxcare.com.au>
 
 	* expr.c (operand): Fix a comment typo.
@@ -75,7 +80,7 @@
 	* config.in: Regenerate.
 	* po/gas.pot: Regenerate.
 	* Makefile.in: Regenerate.
-	
+
 2000-09-01  Alexandre Oliva  <aoliva@redhat.com>
 
 	* config/tc-sh.h [OBJ_ELF] (TC_FIX_ADJUSTABLE): Define.
@@ -415,8 +420,22 @@ Wed Aug  9 16:28:21 EDT 2000	Diego Novillo <dnovillo@cygnus.com>
 	* config/atof-ieee.c: Fix formatting.
 	* config/atof-tahoe.c: Likewise.
 
+2000-07-29  Marek Michalkiewicz  <marekm@linux.org.pl>
+
+<<<<<<< ChangeLog
+	* config/tc-avr.c: Use PARAMS macro in function declarations.
+	Don't declare md_pcrel_from_section (already in tc-avr.h).
+	(avr_operands): Use AVR_UNDEF_P and AVR_SKIP_P macros.
+	(avr_operand): Don't set (unsigned) op_mask to -1.
+=======
 2000-08-06  Nick Clifton  <nickc@cygnus.com>
+>>>>>>> 1.551
+
+<<<<<<< ChangeLog
+2000-08-04  Nick Clifton  <nickc@cygnus.com>
 
+=======
+>>>>>>> 1.551
 	* config/tc-sparc.c (md_begin): Fix typo in recent formatting
 	work.
 

gas/config/tc-mn10300.c

@@ -95,6 +95,9 @@ static boolean address_register_name PARAMS ((expressionS *expressionP));
 static boolean other_register_name PARAMS ((expressionS *expressionP));
 static void set_arch_mach PARAMS ((int));
 
+/*  Set linkrelax here to avoid fixups in most sections.  */
+int linkrelax = 1;
+
 static int current_machine;
 
 /* Fixups.  */
@@ -918,11 +921,6 @@ md_begin ()
       op++;
     }
 
-  /* This is both a simplification (we don't have to write md_apply_fix)
-     and support for future optimizations (branch shortening and similar
-     stuff in the linker).  */
-  linkrelax = 1;
-
   /* Set the default machine type.  */
   if (!bfd_set_arch_mach (stdoutput, bfd_arch_mn10300, MN103))
     as_warn (_("could not set architecture and machine"));
@@ -1903,15 +1901,12 @@ long
 md_pcrel_from (fixp)
      fixS *fixp;
 {
-  return fixp->fx_frag->fr_address;
-#if 0
   if (fixp->fx_addsy != (symbolS *) NULL && !S_IS_DEFINED (fixp->fx_addsy))
     {
       /* The symbol is undefined.  Let the linker figure it out.  */
       return 0;
     }
   return fixp->fx_frag->fr_address + fixp->fx_where;
-#endif
 }
 
 int