From: Dan Nicolaescu Date: Fri, 23 Apr 2010 09:06:43 +0000 (-0700) Subject: (LD_SWITCH_SYSTEM_TEMACS): Remove #undef. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~421 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e324eb6e0ef1b560391bdf3d83e8937aef231c8;p=emacs.git (LD_SWITCH_SYSTEM_TEMACS): Remove #undef. (LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc. --- diff --git a/src/ChangeLog b/src/ChangeLog index 9e08f6a8977..be510c69f1a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-04-23 Dan Nicolaescu + * m/macppc.h (LD_SWITCH_SYSTEM_TEMACS): Remove #undef. + (LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc. + * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc. * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove. diff --git a/src/m/macppc.h b/src/m/macppc.h index 150fc356518..77772521ed7 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -44,10 +44,6 @@ along with GNU Emacs. If not, see . */ #ifdef GNU_LINUX #define LINKER $(CC) -nostdlib -/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here - because prefix-args is not used. */ -#undef LD_SWITCH_SYSTEM_TEMACS -#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc #ifdef _ARCH_PPC64 #undef START_FILES #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o