# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1272008262 25200
# Node ID a39e96e3b891b36fff40e9ddbd8b8f628bd20a44
# Parent  39488fd097e87a149621cd509e49a04b12e1b984
* s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc.
* s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.

diff -r 39488fd097e8 -r a39e96e3b891 src/ChangeLog
--- 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.
diff -r 39488fd097e8 -r a39e96e3b891 src/s/netbsd.h
--- 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
diff -r 39488fd097e8 -r a39e96e3b891 src/s/openbsd.h
--- 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