diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/netbsd.h | 7 | ||||
| -rw-r--r-- | src/s/openbsd.h | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d108a969883..9e08f6a8977 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/s/netbsd.h b/src/s/netbsd.h index 682b9482352..d9c6a1fd3f3 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -56,13 +56,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 --git a/src/s/openbsd.h b/src/s/openbsd.h index a74601d3ad8..c71aea4c9d4 100644 --- a/src/s/openbsd.h +++ b/src/s/openbsd.h @@ -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 |