[Emacs-diffs] /srv/bzr/emacs/trunk r100001: * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100001
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-23 00:37:42 -0700
message:
  * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc.
  * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove.
modified:
  src/ChangeLog
  src/s/netbsd.h
  src/s/openbsd.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-23 07:21:18 +0000
+++ b/src/ChangeLog     2010-04-23 07:37:42 +0000
@@ -1,5 +1,8 @@
 2010-04-23  Dan Nicolaescu  <address@hidden>
 
+       * 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.

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2010-04-02 03:10:33 +0000
+++ b/src/s/netbsd.h    2010-04-23 07:37:42 +0000
@@ -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

=== modified file 'src/s/openbsd.h'
--- a/src/s/openbsd.h   2010-03-20 05:18:05 +0000
+++ b/src/s/openbsd.h   2010-04-23 07:37:42 +0000
@@ -17,7 +17,6 @@
 #define TERMINFO
 #define LIBS_TERMCAP -lncurses
 
-#undef LD_SWITCH_SYSTEM_TEMACS
 #undef LD_SWITCH_SYSTEM
 
   /*  Han Boetes <address@hidden> says this