--- gcc/config/nextstep.h	2018/04/24 18:10:20	1.1.1.1
+++ gcc/config/nextstep.h	2018/04/24 18:20:26	1.1.1.2
@@ -26,26 +26,26 @@ the Free Software Foundation, 675 Mass A
 #undef	INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
   {							\
-    { GPLUSPLUS_INCLUDE_DIR, 1},			\
-    { LOCAL_INCLUDE_DIR, 0},				\
-    { TOOL_INCLUDE_DIR, 0 },				\
-    { GCC_INCLUDE_DIR, 0},				\
+    { GPLUSPLUS_INCLUDE_DIR, 1, 1 },			\
+    { LOCAL_INCLUDE_DIR, 0, 1 },			\
+    { TOOL_INCLUDE_DIR, 0, 1 },				\
+    { GCC_INCLUDE_DIR, 0, 0 },				\
     /* These are for fixincludes-fixed ansi/bsd headers	\
        which wouldn't be found otherwise.		\
        (The use of string catenation here is OK since	\
 	NeXT's native compiler is derived from GCC.) */	\
-    { GCC_INCLUDE_DIR "/ansi", 0 },			\
-    { GCC_INCLUDE_DIR "/bsd", 0 },			\
-    { "/NextDeveloper/Headers", 0},			\
-    { "/NextDeveloper/Headers/ansi", 0},		\
-    { "/NextDeveloper/Headers/bsd", 0},			\
-    { "/LocalDeveloper/Headers", 0},			\
-    { "/LocalDeveloper/Headers/ansi", 0},		\
-    { "/LocalDeveloper/Headers/bsd", 0},		\
-    { "/NextDeveloper/2.0CompatibleHeaders", 0},	\
-    { STANDARD_INCLUDE_DIR, 0},				\
-    { "/usr/include/bsd", 0},				\
-    { 0, 0}						\
+    { GCC_INCLUDE_DIR "/ansi", 0, 0 },			\
+    { GCC_INCLUDE_DIR "/bsd", 0, 0 },			\
+    { "/NextDeveloper/Headers", 0, 0 },			\
+    { "/NextDeveloper/Headers/ansi", 0, 0 },		\
+    { "/NextDeveloper/Headers/bsd", 0, 0 },		\
+    { "/LocalDeveloper/Headers", 0, 0 },		\
+    { "/LocalDeveloper/Headers/ansi", 0, 0 },		\
+    { "/LocalDeveloper/Headers/bsd", 0, 0 },		\
+    { "/NextDeveloper/2.0CompatibleHeaders", 0, 0 },	\
+    { STANDARD_INCLUDE_DIR, 0, 0 },			\
+    { "/usr/include/bsd", 0, 0 },			\
+    { 0, 0, 0 }						\
   }
 #endif /* CROSS_COMPILE */
 
@@ -536,11 +536,19 @@ objc_section_init ()				\
 	  else								\
 	    data_section ();						\
 	}								\
-      else if ((TREE_READONLY (exp) || TREE_CONSTANT (exp))	\
-	       && !TREE_SIDE_EFFECTS (exp))				\
-	readonly_data_section ();					\
+      else if (TREE_CODE (exp) == VAR_DECL)				\
+	{								\
+	  if ((flag_pic && reloc)					\
+	      || !TREE_READONLY (exp) || TREE_SIDE_EFFECTS (exp)	\
+	      || !DECL_INITIAL (exp)					\
+	      || (DECL_INITIAL (exp) != error_mark_node			\
+		  && !TREE_CONSTANT (DECL_INITIAL (exp))))		\
+	    data_section ();						\
+	  else								\
+	    readonly_data_section ();					\
+	}								\
       else								\
-        data_section ();						\
+	readonly_data_section ();					\
     }									\
   while (0)