[Emacs-diffs] Changes to emacs/src/s/netbsd.h

[Richard M. Stallman]

Index: emacs/src/s/netbsd.h
diff -c emacs/src/s/netbsd.h:1.37 emacs/src/s/netbsd.h:1.38
*** emacs/src/s/netbsd.h:1.37   Tue Feb  4 09:03:18 2003
--- emacs/src/s/netbsd.h        Sat Jul 12 17:45:20 2003
***************
*** 60,72 ****
  #endif /* not NO_SHARED_LIBS and not ELF */
  
  #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
! #define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
  #define UNEXEC unexelf.o
! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
  #undef LIB_GCC
  #define LIB_GCC
  #endif
  
  #define HAVE_WAIT_HEADER
  #define WAIT_USE_INT
  
--- 60,77 ----
  #endif /* not NO_SHARED_LIBS and not ELF */
  
  #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
! #define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 
/usr/lib/crtbegin.o
  #define UNEXEC unexelf.o
! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
  #undef LIB_GCC
  #define LIB_GCC
  #endif
  
+ #ifdef HAVE_CRTIN
+ #define START_FILES_1 /usr/lib/crti.o 
+ #define END_FILES_1 /usr/lib/crtn.o
+ #endif
+ 
  #define HAVE_WAIT_HEADER
  #define WAIT_USE_INT
  
***************
*** 85,90 ****
--- 90,102 ----
     /usr/local/include or libs in /usr/local/lib by default.  */
  
  #define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include 
-I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
+ 
+ /* Link temacs with -z nocombreloc so that unexec works right, whether or
+    not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
+    switches, so this also works with older versions that don't implement
+    -z combreloc.  */
+ 
+ #define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc
  
  #endif /* __ELF__ */