--- gcc/config/sparc/sol2.h	2018/04/24 18:10:24	1.1
+++ gcc/config/sparc/sol2.h	2018/04/24 18:21:30	1.1.1.3
@@ -1,7 +1,8 @@
 /* Definitions of target machine for GNU compiler, for SPARC running Solaris 2
    Copyright 1992 Free Software Foundation, Inc.
-   Contributed by Ron Guilmette (rfg@ncd.com) and
-   David V. Henkel-Wallace (gumby@cygnus.com).
+
+   Written by Ron Guilmette (rfg@netcom.com).
+   Additional changes by David V. Henkel-Wallace (gumby@cygnus.com).
 
 This file is part of GNU CC.
 
@@ -24,13 +25,15 @@ the Free Software Foundation, 675 Mass A
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
- "-Dsun -Dsparc -Dunix -D__svr4__ -Asystem(unix) -Acpu(sparc) -Amachine(sparc)\
+ "-Dsun -Dsparc -Dunix -D__svr4__ \
+  -Asystem(unix) -Asystem(svr4) -Acpu(sparc) -Amachine(sparc)\
   -D__GCC_NEW_VARARGS__"
 
 #undef CPP_SPEC
 #define CPP_SPEC "\
-   %{compat-bsd:-iwithprefix ucbinclude -idirafter /usr/ucbinclude}\
-   %{msparclite:-D__sparclite__} %{mv8:-D__sparc_v8__}"
+   %{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude}\
+   %{msparclite:-D__sparclite__} %{mv8:-D__sparc_v8__}\
+   %{msupersparc:-D__supersparc__ -D__sparc_v8__}"
 
 /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
    It's safe to pass -s always, even if -g is not used. */
@@ -48,57 +51,9 @@ the Free Software Foundation, 675 Mass A
 
 /* We use stabs-in-elf for debugging, because that is what the native
    toolchain uses.  */
-#define DBX_DEBUGGING_INFO
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#define DBX_BLOCKS_FUNCTION_RELATIVE 1
-
-/* "gcc2_compiled." must be a .stabs, not an ordinary symbol, or GDB won't
-   see it.  Furthermore, since GDB reads the input piecemeal, starting
-   with each N_SO, it's a lot easier if the gcc2 flag symbol is *after*
-   the N_SO rather than before it.  So we emit an N_OPT stab here.  */
-
-#define ASM_IDENTIFY_GCC(FILE)	/* Do nothing */
-
-#define ASM_IDENTIFY_GCC_AFTER_SOURCE(FILE)	\
- fputs ("\t.stabs\t\"gcc2_compiled.\", 0x3c, 0, 0, 0\n", FILE)
-
-#undef CTORS_SECTION_ASM_OP
-#undef DTORS_SECTION_ASM_OP
-
-#if 0 /* These seems unnecessary; the ones in sparc/sysv4.h look right.  */
-#undef TEXT_SECTION_ASM_OP
-#undef DATA_SECTION_ASM_OP
-#undef BSS_SECTION_ASM_OP
-#undef CONST_SECTION_ASM_OP
-#undef INIT_SECTION_ASM_OP
-
-#define TEXT_SECTION_ASM_OP	"\t.section\t\".text\""
-#define DATA_SECTION_ASM_OP	"\t.section\t\".data\""
-#define BSS_SECTION_ASM_OP	"\t.section\t\".bss\""
-
-#define CONST_SECTION_ASM_OP	"\t.section\t\".rodata\""
-#define INIT_SECTION_ASM_OP	"\t.section\t\".init\""
-#endif
-
-#define CTORS_SECTION_ASM_OP	"\t.section\t\".ctors\",#alloc,#execinstr\n"
-#define DTORS_SECTION_ASM_OP	"\t.section\t\".dtors\",#alloc,#execinstr\n"
-
-/* The native assembler can't compute differences between symbols in different
-   sections when generating pic code, so we must put jump tables in the
-   text section.  */
-#define JUMP_TABLES_IN_TEXT_SECTION 1
-
-/* Must use data section for relocatable constants when pic.  */
-#undef SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE,RTX)		\
-{						\
-  if (flag_pic && symbolic_operand (RTX))	\
-    data_section ();				\
-  else						\
-    const_section ();				\
-}
-
 /* The Solaris 2 assembler uses .skip, not .zero, so put this back. */
 #undef ASM_OUTPUT_SKIP
 #define ASM_OUTPUT_SKIP(FILE,SIZE)  \
@@ -139,20 +94,6 @@ do {									\
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM)	\
   sprintf (LABEL, "*.L%s%d", PREFIX, NUM)
 
-/* in Solaris 2.0, linenos are relative to the current fn. */
-#undef  ASM_OUTPUT_SOURCE_LINE
-#define ASM_OUTPUT_SOURCE_LINE(file, line)		\
-  { static int sym_lineno = 1;				\
-    fprintf (file, ".stabn 68,0,%d,.LM%d-%s\n.LM%d:\n",	\
-	     line, sym_lineno, 				\
-	     XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0), \
-	     sym_lineno);				\
-    sym_lineno += 1; }
-
-/* But, to make this work, we have to output the stabs for the function
-   name *first*...  */
-#define	DBX_FUNCTION_FIRST
-
 
 /* We don't use the standard svr4 STARTFILE_SPEC because it's wrong for us.
    We don't use the standard LIB_SPEC only because we don't yet support c++ */
@@ -224,3 +165,9 @@ do {									\
    || (CHAR) == 'A' \
    || (CHAR) == 'h' \
    || (CHAR) == 'z')
+
+/* ??? This does not work in SunOS 4.x, so it is not enabled in sparc.h.
+   Instead, it is enabled here, because it does work under Solaris.  */
+/* Define for support of TFmode long double and REAL_ARITHMETIC.
+   Sparc ABI says that long double is 4 words.  */
+#define LONG_DOUBLE_TYPE_SIZE 128