From 0b5e1ab5253d534e171ee047dfa14b451c1597a3 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Fri, 21 Jul 2000 05:45:22 +0000
Subject: [PATCH] merge with gcc

---
 config/ChangeLog      | 13 +++++++++++++
 config/mh-irix6       |  4 ----
 config/mh-openedition |  2 ++
 config/mh-sparcpic    |  2 +-
 config/mt-sparcpic    |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 config/mh-openedition

diff --git a/config/ChangeLog b/config/ChangeLog
index 2e7e6fc793e..920ab3226a8 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jul 14 18:13:23 2000  Mark P Mitchell  <mark@codesourcery.com>
+
+	* mh-irix6 (CC): Don't set it.
+
+2000-06-21  Branko Cibej  <branko.cibej@hermes.si>
+
+	* mh-sparcpic: Use single instead of double quotes.
+	* mt-sparcpic: Likewise.
+
 2000-06-19  Syd Polk <spolk@redhat.com>
 
 	* acinclude.m4: Updated for Incr Tcl 3.0.
@@ -16,6 +25,10 @@
 	* mh-aix43: Delete, move to mt-aix43.
 	* mt-aix43: New file.
 
+Tue Sep  7 23:31:01 1999  Linas Vepstas  <linas@linas.org>
+
+	* mh-openedition: New file.
+
 1999-04-07  Michael Meissner  <meissner@cygnus.com>
 
 	* mt-d30v: New file, pass -g -Os -Wa,-C as default options.
diff --git a/config/mh-irix6 b/config/mh-irix6
index 6d25c16b2f4..e7926788963 100644
--- a/config/mh-irix6
+++ b/config/mh-irix6
@@ -1,7 +1,3 @@
 # Makefile changes for SGI's running IRIX-6.x.
 SYSV = -DSYSV
 RANLIB = true
-# Specify the ABI, to ensure that all Irix 6 systems will behave the same.
-# Also, using -32 avoids bugs that exist in the n32/n64 support in some
-# versions of the SGI compiler.
-CC = cc -32
diff --git a/config/mh-openedition b/config/mh-openedition
new file mode 100644
index 00000000000..e99ef155fd2
--- /dev/null
+++ b/config/mh-openedition
@@ -0,0 +1,2 @@
+RANLIB = true
+CC = c89
diff --git a/config/mh-sparcpic b/config/mh-sparcpic
index f6dbc22e3ca..e218bb48aa4 100644
--- a/config/mh-sparcpic
+++ b/config/mh-sparcpic
@@ -1 +1 @@
-PICFLAG=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
+PICFLAG=`case '${LIBCFLAGS} ${LIBCXXFLAGS}' in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
diff --git a/config/mt-sparcpic b/config/mt-sparcpic
index fd0ec271afc..a62b38bd9c1 100644
--- a/config/mt-sparcpic
+++ b/config/mt-sparcpic
@@ -1 +1 @@
-PICFLAG_FOR_TARGET=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
+PICFLAG_FOR_TARGET=`case '${LIBCFLAGS} ${LIBCXXFLAGS}' in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
-- 
2.30.2