[Emacs-diffs] /srv/bzr/emacs/trunk r100000: Simplify STARTFILES definition.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100000
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-23 00:21:18 -0700
message:
  Simplify STARTFILES definition.
  * s/hpux10-20.h (START_FILES): Explicitly define here instead of
  relying on Makefile.in to define it.
  * s/cygwin.h (START_FILES): Likewise.
  * Makefile.in (STARTFILES): Remove conditional code, not needed anymore.
modified:
  src/ChangeLog
  src/Makefile.in
  src/s/cygwin.h
  src/s/hpux10-20.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-23 07:00:38 +0000
+++ b/src/ChangeLog     2010-04-23 07:21:18 +0000
@@ -1,5 +1,11 @@
 2010-04-23  Dan Nicolaescu  <address@hidden>
 
+       Simplify STARTFILES definition.
+       * s/hpux10-20.h (START_FILES): Explicitly define here instead of
+       relying on Makefile.in to define it.
+       * s/cygwin.h (START_FILES): Likewise.
+       * Makefile.in (STARTFILES): Remove conditional code, not needed anymore.
+
        Clean up Solaris code.
        * s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS, C_SWITCH_X_SYSTEM)
        (LIB_MOTIF): Remove, configure takes care of this.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-20 18:52:07 +0000
+++ b/src/Makefile.in   2010-04-23 07:21:18 +0000
@@ -219,25 +219,7 @@
 #define LD_SWITCH_X_DEFAULT
 #endif
 
-#ifndef ORDINARY_LINK
-
-#ifndef START_FILES
-#ifdef NO_REMAP
-#define START_FILES pre-crt0.o /lib/crt0.o
-#else /* ! defined (NO_REMAP) */
-#define START_FILES ecrt0.o
-#endif /* ! defined (NO_REMAP) */
-#endif /* START_FILES */
-STARTFILES = START_FILES
-
-#else /* ORDINARY_LINK */
-
-/* config.h might want to force START_FILES anyway */
-#ifdef START_FILES
-STARTFILES = START_FILES
-#endif /* START_FILES */
-
-#endif /* not ORDINARY_LINK */
+STARTFILES = START_FILES
 
 
 #ifdef NS_IMPL_GNUSTEP

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2010-04-16 01:00:45 +0000
+++ b/src/s/cygwin.h    2010-04-23 07:21:18 +0000
@@ -140,6 +140,8 @@
 #define LIB_MATH
 #define LIBS_DEBUG
 
+#define START_FILES ecrt0.o
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2010-04-21 19:32:54 +0000
+++ b/src/s/hpux10-20.h 2010-04-23 07:21:18 +0000
@@ -175,6 +175,8 @@
 
 #define NO_REMAP
 
+#define START_FILES pre-crt0.o /lib/crt0.o
+
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
    pure and impure space as loaded can vary, and even their
    relative order cannot be relied on.