(LD_SWITCH_SYSTEM_TEMACS): Remove #undef.

(LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e08f6a89778d69a5cad58aaeecafc26533432f4..be510c69f1a6da2d5ca606c53341b3331b54a8a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * 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 150fc35651827551ee312545d55770173191fe2a..77772521ed7b2669484b60323efdefc5d76be6f1 100644 (file)
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -44,10 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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