# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1272007278 25200
# Node ID 39488fd097e87a149621cd509e49a04b12e1b984
# Parent  5772419843076aa7db56681e06b261b3635c2707
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.

diff -r 577241984307 -r 39488fd097e8 src/ChangeLog
--- a/src/ChangeLog	Fri Apr 23 00:00:38 2010 -0700
+++ b/src/ChangeLog	Fri Apr 23 00:21:18 2010 -0700
@@ -1,5 +1,11 @@
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	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.
diff -r 577241984307 -r 39488fd097e8 src/Makefile.in
--- a/src/Makefile.in	Fri Apr 23 00:00:38 2010 -0700
+++ b/src/Makefile.in	Fri Apr 23 00:21:18 2010 -0700
@@ -219,26 +219,8 @@
 #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 */
-
 
 #ifdef NS_IMPL_GNUSTEP
 /* Pull in stuff from GNUstep-make. */
diff -r 577241984307 -r 39488fd097e8 src/s/cygwin.h
--- a/src/s/cygwin.h	Fri Apr 23 00:00:38 2010 -0700
+++ b/src/s/cygwin.h	Fri Apr 23 00:21:18 2010 -0700
@@ -140,6 +140,8 @@
 #define LIB_MATH
 #define LIBS_DEBUG
 
+#define START_FILES ecrt0.o
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
diff -r 577241984307 -r 39488fd097e8 src/s/hpux10-20.h
--- a/src/s/hpux10-20.h	Fri Apr 23 00:00:38 2010 -0700
+++ b/src/s/hpux10-20.h	Fri Apr 23 00:21:18 2010 -0700
@@ -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.