(INCLUDE_DEFAULTS): Undo previous change.

[pf3gnuchains/gcc-fork.git] / gcc / config / nextstep.h

diff --git a/gcc/config/nextstep.h b/gcc/config/nextstep.h
index dc2f020..7b431a9 100644 (file)
--- a/gcc/config/nextstep.h
+++ b/gcc/config/nextstep.h
@@ -1,4 +1,4 @@
-/* next.h -- operating system specific defines to be used when
+/* nextstep.h -- operating system specific defines to be used when
    targeting GCC for NeXTSTEP.
    Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 
@@ -37,15 +37,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
     { "/LocalDeveloper/Headers/bsd", 0},               \
     { "/NextDeveloper/2.0CompatibleHeaders", 0},       \
     { STANDARD_INCLUDE_DIR, 0},                                \
+    { "/usr/include/bsd", 0},                          \
     { 0, 0}                                            \
   }
 #endif /* CROSS_COMPILE */
 
-/* Search for compiler tools in /lib.  */
-
-#undef STANDARD_EXEC_PREFIX
-#define STANDARD_EXEC_PREFIX "/lib/"
-
 #undef EXTRA_FORMAT_FUNCTIONS
 #define EXTRA_FORMAT_FUNCTIONS \
       "NXPrintf",      FALSE,  2,      FALSE,  \
@@ -56,14 +52,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
       "bsd_sprintf",   FALSE,  2,      FALSE,  \
       "bsd_vsprintf",  FALSE,  2,      TRUE,
 
-/* Use NeXT's special calling convention for sending an Objc message.  */
+/* Make -fnext-runtime the default.  */
 
 #define NEXT_OBJC_RUNTIME
 
-/* NeXT-private compiler modifications */
-
-#define NeXT_OBJC
-
 /* We have atexit.  */
 
 #define HAVE_ATEXIT
@@ -89,11 +81,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef WORD_SWITCH_TAKES_ARG
 #define WORD_SWITCH_TAKES_ARG(STR)             \
-  (!strcmp (STR, "Ttext") ? 1 :                        \
-   !strcmp (STR, "Tdata") ? 1 :                        \
-   !strcmp (STR, "Tbss") ? 1 :                 \
-   !strcmp (STR, "include") ? 1 :              \
-   !strcmp (STR, "imacros") ? 1 :              \
+  (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) ? 1 :   \
    !strcmp (STR, "segalign") ? 1 :             \
    !strcmp (STR, "seg1addr") ? 1 :             \
    !strcmp (STR, "segaddr") ? 2 :              \
@@ -103,7 +91,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    !strcmp (STR, "sectalign") ? 3 :            \
    !strcmp (STR, "segcreate") ? 3 :            \
    !strcmp (STR, "sectorder") ? 3 :            \
-   !strcmp (STR, "aux-info") ? 1 :             \
    !strcmp (STR, "siff-mask") ? 1 :            \
    !strcmp (STR, "siff-filter") ? 1 :          \
    !strcmp (STR, "siff-warning") ? 1 :         \