changeset 108075:a39e96e3b891

* s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc. * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 23 Apr 2010 00:37:42 -0700
parents 39488fd097e8
children 269804f5b53b 216b6ef76da7
files src/ChangeLog src/s/netbsd.h src/s/openbsd.h
diffstat 3 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Apr 23 00:21:18 2010 -0700
+++ b/src/ChangeLog	Fri Apr 23 00:37:42 2010 -0700
@@ -1,5 +1,8 @@
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc.
+	* s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.
+
 	Simplify STARTFILES definition.
 	* s/hpux10-20.h (START_FILES): Explicitly define here instead of
 	relying on Makefile.in to define it.
--- a/src/s/netbsd.h	Fri Apr 23 00:21:18 2010 -0700
+++ b/src/s/netbsd.h	Fri Apr 23 00:37:42 2010 -0700
@@ -56,13 +56,6 @@
 
 #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
-
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
    the library search parth, i.e. it won't search /usr/lib
    for libc and friends. Using -nostartfiles instead avoids
--- a/src/s/openbsd.h	Fri Apr 23 00:21:18 2010 -0700
+++ b/src/s/openbsd.h	Fri Apr 23 00:37:42 2010 -0700
@@ -17,7 +17,6 @@
 #define TERMINFO
 #define LIBS_TERMCAP -lncurses
 
-#undef LD_SWITCH_SYSTEM_TEMACS
 #undef LD_SWITCH_SYSTEM
 
   /*  Han Boetes <han@mijncomputer.nl> says this