*** egcs-971225/gcc/cccp.c      Sun Jan 11 22:17:11 1998
--- dist/egcs-971225/gcc/cccp.c Mon Dec  8 23:55:17 1997
***************
*** 358,369 ****
  
  /* Nonzero means warn if #import is used.  */
  
- #ifdef NeXT
- /* NEXTSTEP uses #import in all of the system headers.  Generating a warning each time is not an option. */
- static int warn_import = 0;
- #else
  static int warn_import = 1;
- #endif
  
  /* Nonzero means turn warnings into errors.  */
  
--- 358,364 ----
*** egcs-971225/gcc/cpplib.c    Sun Jan 11 22:17:45 1998
--- dist/egcs-971225/gcc/cpplib.c       Sat Dec  6 16:28:14 1997
***************
*** 811,822 ****
    opts->pedantic_errors = 0;
    opts->inhibit_warnings = 0;
    opts->warn_comments = 0;
- #ifdef NeXT
- /* NEXTSTEP uses #import in all of the system headers.  Generating a warning each time is not an option. */
-   opts->warn_import = 0;
- #else
    opts->warn_import = 1;
- #endif
    opts->warnings_are_errors = 0;
  }
  
--- 811,817 ----
*** egcs-971225/gcc/config/nextstep.h   Mon Jan 12 10:11:01 1998
--- dist/egcs-971225/gcc/config/nextstep.h      Sat Dec  6 09:24:06 1997
***************
*** 104,120 ****
  
  /* These compiler options take n arguments.  */
  
- #warning TJW: This does not work quite right since we do not included all of the contents of the NS4.2 specs file in the specs file generated for the stage1 build.  So, I am guessing that this is not defined for the stage two build.
- 
- #if NS_TARGET_MAJOR >= 4
-    /* This is an incomplete list of the new args that the linker accepts */
-    /* TJW: Need to get to integrate the -F switch for adding framework directories.  Could probably just crib the code from the NeXT version of gcc. */
- #define NS4_WORD_SWITCH_ARG(STR) \
-    !strcmp (STR, "framework") ? 1 :
- #else
- #define NS4_WORD_SWITCH_ARG(STR)
- #endif
- 
  #undef        WORD_SWITCH_TAKES_ARG
  #define WORD_SWITCH_TAKES_ARG(STR)            \
    (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) ? 1 :  \
--- 104,109 ----
***************
*** 132,138 ****
     !strcmp (STR, "siff-warning") ? 1 :                \
     !strcmp (STR, "arch") ? 1 :                        \
     !strcmp (STR, "pagezero_size") ? 1 :               \
-    NS4_WORD_SWITCH_ARG(STR)                   \
     0)
  
  #undef        WORD_SWITCH
--- 121,126 ----
***************
*** 168,198 ****
  /* Machine dependent libraries.  */
  
  #undef        LIB_SPEC
- #if NS_TARGET_MAJOR >= 4
- #define LIB_SPEC "%{!posix*:-lcc_dynamic -framework System} %{posix*:-lposix}"
- #else
  #define LIB_SPEC "%{!posix*:-lsys_s} %{posix*:-lposix}"
- #endif
  
! /* We specify crt[01].o as -lcrt[01].o so that ld will search the library path. */
  
  #undef        STARTFILE_SPEC
- #if NS_TARGET_MAJOR >= 4
-     /* TJW: I did not touch the profiling part of this */
-     /* TJW: The '-read_only_relocs suppress' disables warnings generated by the NeXT linker
-        due to the fact that egcs is putting relocation entries in the text segment
-        rather than (I presume) the data segment.  Someone should fix this when they
-        get a chance.  This doesn't break anything that I know of, but just makes the
-        program take up more swap (since it has to make those pages writable).
-      */
- #define STARTFILE_SPEC  \
-     "%{!posix*:%{pg:-read_only_relocs suppress -dynamic -lgcrt1.o}%{!pg: \
-      %{p:%e-p profiling is no longer supported.  Use -pg instead.} \
-      %{!p:-read_only_relocs suppress -dynamic -lcrt1.o}}}\
-      %{posix*:%{pg:-lgposixcrt0.o}%{!pg: \
-      %{p:%e-p profiling is no longer supported.  Use -pg instead.} \
-      %{!p:-lposixcrt0.o}}}"
- #else
  #define STARTFILE_SPEC  \
      "%{!posix*:%{pg:-lgcrt0.o}%{!pg: \
       %{p:%e-p profiling is no longer supported.  Use -pg instead.} \
--- 156,166 ----
  /* Machine dependent libraries.  */
  
  #undef        LIB_SPEC
  #define LIB_SPEC "%{!posix*:-lsys_s} %{posix*:-lposix}"
  
! /* We specify crt0.o as -lcrt0.o so that ld will search the library path. */
  
  #undef        STARTFILE_SPEC
  #define STARTFILE_SPEC  \
      "%{!posix*:%{pg:-lgcrt0.o}%{!pg: \
       %{p:%e-p profiling is no longer supported.  Use -pg instead.} \
***************
*** 200,206 ****
       %{posix*:%{pg:-lgposixcrt0.o}%{!pg: \
       %{p:%e-p profiling is no longer supported.  Use -pg instead.} \
       %{!p:-lposixcrt0.o}}}"
- #endif
  
  /* Allow #sscs (but don't do anything). */
  
--- 168,173 ----