[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/s/netbsd.h [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/s/netbsd.h [lexbind] |
Date: |
Tue, 14 Oct 2003 19:23:16 -0400 |
Index: emacs/src/s/netbsd.h
diff -c emacs/src/s/netbsd.h:1.36.2.1 emacs/src/s/netbsd.h:1.36.2.2
*** emacs/src/s/netbsd.h:1.36.2.1 Fri Apr 4 01:21:12 2003
--- emacs/src/s/netbsd.h Tue Oct 14 19:22:53 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,80 ----
#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
+ #else
+ #define START_FILES_1
+ #define END_FILES_1
+ #endif
+
#define HAVE_WAIT_HEADER
#define WAIT_USE_INT
***************
*** 86,91 ****
--- 94,106 ----
#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 -Wl,-z,nocombreloc
+
#endif /* __ELF__ */
/* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
***************
*** 123,125 ****
--- 138,142 ----
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+ /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
+ (do not change this comment) */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/s/netbsd.h [lexbind],
Miles Bader <=