Merge from gcc-2.8

From-SVN: r16987

5 files changed, 12 insertions, 16 deletions

diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index 9ba66f7..837712a 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -1,4 +1,5 @@
-/* Definitions for Motorola 68k running Linux with ELF format.
+/* Definitions for Motorola 68k running Linux-based GNU systems with
+   ELF format.
    Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -30,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include <linux.h>		/* some common stuff */
 
 #undef TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (68k Linux/ELF)");
+#define TARGET_VERSION fprintf (stderr, " (68k GNU/Linux with ELF)");
 
 /* 68020 with 68881 */
 #define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
@@ -135,7 +136,7 @@ Boston, MA 02111-1307, USA.  */
   "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} \
 %{m68040} %{m68060:-m68040}"
 
-/* Provide a LINK_SPEC appropriate for Linux.  Here we provide support
+/* Provide a LINK_SPEC appropriate for GNU/Linux.  Here we provide support
    for the special GCC options -static and -shared, which allow us to
    link things in one of these three modes by applying the appropriate
    combinations of options at link-time.  We like to support here for
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 605369f..4d958f1 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-flags.h"
 #include "output.h"
 #include "insn-attr.h"
-#include "dwarf2.h"
+#include "tree.h"
 
 /* Needed for use_return_insn.  */
 #include "flags.h"
@@ -1313,6 +1313,8 @@ legitimize_pic_address (orig, mode, reg)
 			 gen_rtx (PLUS, Pmode,
 				  pic_offset_table_rtx, orig));
       current_function_uses_pic_offset_table = 1;
+      if (reload_in_progress)
+	regs_ever_live[PIC_OFFSET_TABLE_REGNUM] = 1;
       RTX_UNCHANGING_P (pic_ref) = 1;
       emit_move_insn (reg, pic_ref);
       return reg;
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 6004aaa..8c9cad0 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -280,8 +280,8 @@ extern int target_flags;
 
 /* No data type wants to be aligned rounder than this. 
    Most published ABIs say that ints should be aligned on 16 bit
-   boundries, but cpus with 32 bit busses get better performance
-   aligned on 32 bit boundries.  Coldfires without a misalignment
+   boundaries, but cpus with 32 bit busses get better performance
+   aligned on 32 bit boundaries.  Coldfires without a misalignment
    module require 32 bit alignment. */
 #define BIGGEST_ALIGNMENT (TARGET_ALIGN_INT ? 32 : 16)
 
@@ -378,7 +378,7 @@ extern int target_flags;
    and are not available for the register allocator.
    On the 68000, only the stack pointer is such.  */
 
-/* fpa0 is also reserved so that it can be used to move shit back and
+/* fpa0 is also reserved so that it can be used to move data back and
    forth between high fpa regs and everything else. */
 
 #define FIXED_REGISTERS        \
diff --git a/gcc/config/m68k/rtems.h b/gcc/config/m68k/rtems.h
index 7472346..77c02f8 100644
--- a/gcc/config/m68k/rtems.h
+++ b/gcc/config/m68k/rtems.h
@@ -1,4 +1,4 @@
-/* Definitions for rtems targetting a Motorola m68k using coff.
+/* Definitions for rtems targeting a Motorola m68k using coff.
    Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (joel@OARcorp.com).
 
diff --git a/gcc/config/m68k/xm-mot3300.h b/gcc/config/m68k/xm-mot3300.h
index 0c1ec67..8f4c0a4 100644
--- a/gcc/config/m68k/xm-mot3300.h
+++ b/gcc/config/m68k/xm-mot3300.h
@@ -1,6 +1,6 @@
 /* Configuration for GNU C-compiler for Motorola 68000 family.
    SysV68 Motorola 3300 Delta Series
-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -24,13 +24,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "m68k/xm-m68k.h"
 
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-#define rindex strrchr
-#define index strchr
-
 #define NO_SYS_SIGLIST
 
 /* do not use alloca from -lPW with cc, because function epilogues use %sp */