aboutsummaryrefslogtreecommitdiff
path: root/gcc/config/convex
diff options
context:
space:
mode:
authorJeff Law <law@gcc.gnu.org>1998-12-16 15:24:51 -0700
committerJeff Law <law@gcc.gnu.org>1998-12-16 15:24:51 -0700
commita0d66c8d678e61730d6a51dc9e60af73410d1372 (patch)
tree26c7837413542129a58d2af069722749fc2c2764 /gcc/config/convex
parent83a86272a2e76ea304122db44f4808a5ce250631 (diff)
downloadgcc-a0d66c8d678e61730d6a51dc9e60af73410d1372.zip
gcc-a0d66c8d678e61730d6a51dc9e60af73410d1372.tar.gz
gcc-a0d66c8d678e61730d6a51dc9e60af73410d1372.tar.bz2
dummy import to prevent merge lossage
From-SVN: r24349
Diffstat (limited to 'gcc/config/convex')
-rw-r--r--gcc/config/convex/convex.c6
-rw-r--r--gcc/config/convex/x-convex2
-rw-r--r--gcc/config/convex/xm-convex.h7
3 files changed, 4 insertions, 11 deletions
diff --git a/gcc/config/convex/convex.c b/gcc/config/convex/convex.c
index f642fb0..cd2eb55 100644
--- a/gcc/config/convex/convex.c
+++ b/gcc/config/convex/convex.c
@@ -1,5 +1,5 @@
/* Subroutines for insn-output.c for Convex.
- Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 1997 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -19,6 +19,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "config.h"
+#include <stdio.h>
#include "tree.h"
#include "rtl.h"
#include "regs.h"
@@ -31,9 +32,6 @@ Boston, MA 02111-1307, USA. */
#include "output.h"
#include "expr.h"
-#undef NULL
-#include <stdio.h>
-
/* Tables used in convex.h */
char regno_ok_for_index_p_base[1 + LAST_VIRTUAL_REGISTER + 1];
diff --git a/gcc/config/convex/x-convex b/gcc/config/convex/x-convex
index e1fbe74..8029ac5 100644
--- a/gcc/config/convex/x-convex
+++ b/gcc/config/convex/x-convex
@@ -1,5 +1,5 @@
# ld can make exe's c2-only if this lib is searched even though not loaded
-CCLIBFLAGS = -tm c1
+CCLIBFLAGS = -tm c1
# Use -pcc to avoid surprises.
CC = cc -pcc
diff --git a/gcc/config/convex/xm-convex.h b/gcc/config/convex/xm-convex.h
index ebe3345..aaaa3b1 100644
--- a/gcc/config/convex/xm-convex.h
+++ b/gcc/config/convex/xm-convex.h
@@ -1,5 +1,5 @@
/* Configuration for GNU C-compiler for Convex.
- Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1993, 1997 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -42,11 +42,6 @@ Boston, MA 02111-1307, USA. */
#define P_tmpdir "/tmp/"
-/* Use memcpy and memset -- either would work but these get inlined. */
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-
/* Convex uses Vax or IEEE floats.
Both formats have Vax semantics. */