* config/sparc/xm-sp64.h: Avoid using __sparc_v9__ when testing

	for sparc64.
	* config/sparc/sparc.h: Likewise.
	* config/sparc/xm-sysv4-64.h: Likewise.
	* config/float-sparc.h: Likewise.
	* glimits.h: Likewise.
	* longlong.h: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30917 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 20 insertions, 12 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00190364344..5dbd9a695dc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -39,6 +39,14 @@ Tue Dec 14 12:07:29 MET 1999  Jan Hubicka  <hubicka@freesoft.cz>
 	macros on TARGET_ARCH32. sparc.h has macros good enough for sparc64.
 	* config/sparc/sol2.h (MACHINE_STATE_*): Likewise.
 
+	* config/sparc/xm-sp64.h: Avoid using __sparc_v9__ when testing
+	for sparc64.
+	* config/sparc/sparc.h: Likewise.
+	* config/sparc/xm-sysv4-64.h: Likewise.
+	* config/float-sparc.h: Likewise.
+	* glimits.h: Likewise.
+	* longlong.h: Likewise.
+
 1999-12-14  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* combine.c (combine_simplify_rtx): Don't make shared rtl.
diff --git a/gcc/config/float-sparc.h b/gcc/config/float-sparc.h
index b7356ad3d54..292019835b6 100644
--- a/gcc/config/float-sparc.h
+++ b/gcc/config/float-sparc.h
@@ -66,7 +66,7 @@
 #undef DBL_MAX_10_EXP
 #define DBL_MAX_10_EXP 308
 
-#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+#if defined(__sparcv9) || defined(__arch64__)
 
    /* Number of base-FLT_RADIX digits in the significand of a long double */
 #undef LDBL_MANT_DIG
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index ad8db75c7d8..b38b6f3c3d1 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -35,11 +35,11 @@ Boston, MA 02111-1307, USA.  */
    runtime selection.  */
 #ifdef SPARC_BI_ARCH
 #ifdef IN_LIBGCC2
-#if defined(__sparcv9) || defined(__sparcv_v9) || defined(__arch64__)
+#if defined(__sparcv9) || defined(__arch64__)
 #define TARGET_ARCH32 0
 #else
 #define TARGET_ARCH32 1
-#endif /* V9 sparc */
+#endif /* sparc64 */
 #else
 #define TARGET_ARCH32 (! TARGET_64BIT)
 #endif /* IN_LIBGCC2 */
diff --git a/gcc/config/sparc/xm-sp64.h b/gcc/config/sparc/xm-sp64.h
index b673161282f..2f084331ce2 100644
--- a/gcc/config/sparc/xm-sp64.h
+++ b/gcc/config/sparc/xm-sp64.h
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 #include <sparc/xm-sparc.h>
 
 /* This describes the machine the compiler is hosted on.  */
-#if defined(__arch64__) || defined(__sparc_v9__) || defined(__sparcv9)
+#if defined(__arch64__) || defined(__sparcv9)
 #undef HOST_BITS_PER_LONG
 #define HOST_BITS_PER_LONG 64
 #endif
diff --git a/gcc/config/sparc/xm-sysv4-64.h b/gcc/config/sparc/xm-sysv4-64.h
index c506d22dd36..4ff56b90dea 100644
--- a/gcc/config/sparc/xm-sysv4-64.h
+++ b/gcc/config/sparc/xm-sysv4-64.h
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 #include <sparc/xm-sysv4.h>
 
 /* This describes the machine the compiler is hosted on.  */
-#if defined(__arch64__) || defined(__sparc_v9__) || defined(__sparcv9)
+#if defined(__arch64__) || defined(__sparcv9)
 #undef HOST_BITS_PER_LONG
 #define HOST_BITS_PER_LONG 64
 #endif
diff --git a/gcc/glimits.h b/gcc/glimits.h
index 559e712d726..93e7b8d69ef 100644
--- a/gcc/glimits.h
+++ b/gcc/glimits.h
@@ -64,7 +64,7 @@
 /* Minimum and maximum values a `signed long int' can hold.
    (Same as `int').  */
 #ifndef __LONG_MAX__
-#if defined (__alpha__) || defined (__sparc_v9__) || defined (__sparcv9)
+#if defined (__alpha__) || (defined (__sparc__) && defined(__arch64__)) || defined (__sparcv9)
 #define __LONG_MAX__ 9223372036854775807L
 #else
 #define __LONG_MAX__ 2147483647L
diff --git a/gcc/longlong.h b/gcc/longlong.h
index a2e56c4c674..6c91d4d4754 100644
--- a/gcc/longlong.h
+++ b/gcc/longlong.h
@@ -993,8 +993,8 @@ UDItype __umulsidi3 (USItype, USItype);
 #define UMUL_TIME 5
 #endif
 
-#if defined (__sparc__) && !defined (__sparc_v9__) && !defined(__arch64__) \
-    && !defined(__sparc_v9) && W_TYPE_SIZE == 32
+#if defined (__sparc__) && !defined (__arch64__) && !defined (__sparcv9) \
+    && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   __asm__ ("addcc %r4,%5,%1
 	addx %r2,%3,%0"							\
@@ -1180,10 +1180,10 @@ UDItype __umulsidi3 (USItype, USItype);
 #define UDIV_TIME (3+7*32)	/* 7 instructions/iteration. 32 iterations. */
 #endif /* __sparclite__ */
 #endif /* __sparc_v8__ */
-#endif /* __sparc__ */
+#endif /* sparc32 */
 
-#if (defined (__sparc_v9__) || (defined (__sparc__) && defined (__arch64__)) \
-    || defined (__sparcv9)) && W_TYPE_SIZE == 64
+#if ((defined (__sparc__) && defined (__arch64__)) || defined (__sparcv9)) \
+    && W_TYPE_SIZE == 64
 #define add_ssaaaa(sh, sl, ah, al, bh, bl)				\
   __asm__ ("addcc %r4,%5,%1
   	    add %r2,%3,%0
@@ -1246,7 +1246,7 @@ UDItype __umulsidi3 (USItype, USItype);
   } while (0)
 #define UMUL_TIME 96
 #define UDIV_TIME 230
-#endif /* __sparc_v9__ */
+#endif /* sparc64 */
 
 #if defined (__vax__) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \