Remove LD_SWITCH_MACHINE.

* Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
(TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.

* configure.in (LD_SWITCH_MACHINE, ld_switch_machine): Remove, unused.
(ac_link): Do not use ld_switch_machine.

2 files changed, 7 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f4fcb22b299..4d3c6dca4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Remove LD_SWITCH_MACHINE.
+        * Makefile.in (LD_SWITCH_MACHINE): Remove definition, unused.
+        (TEMACS_LDFLAGS): Do not use LD_SWITCH_MACHINE.
+
         Clean up IRIX code.
         * m/iris4d.h (TERMINFO, FIRST_PTY_LETTER): Move definitions ...
         * s/irix6-5.h (TERMINFO, FIRST_PTY_LETTER): ... here.
diff --git a/src/Makefile.in b/src/Makefile.in
index e221c4a5934..3e026d52c5d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -203,11 +203,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
 #define LD_SWITCH_SYSTEM_TEMACS
 #endif
 
-/* Some m/MACHINE.h files define this to request special switches in ld.  */
-#ifndef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE
-#endif
-
 /* These macros are for switches specifically related to X Windows.  */
 #ifndef LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE
@@ -337,7 +332,7 @@ LD=ld
 /* Flags to pass to LD only for temacs.  */
 /* Do not split this line with a backslash.  That can cause trouble with
    some cpps.  */
-TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE
+TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS
 
 /* A macro which other sections of Makefile can redefine to munge the
    flags before they are passed to LD.  This is helpful if you have
@@ -751,8 +746,8 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
     ${LIBES}
 #endif
 
-/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
-   often contain options that have to do with using Emacs''s crt0,
+/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM
+   often contains options that have to do with using Emacs''s crt0,
    which are only good with temacs.  */
 prefix-args${EXEEXT}: prefix-args.o $(config_h)
         $(CC) $(LDFLAGS) prefix-args.o -o prefix-args