Mercurial > emacs
changeset 108074:39488fd097e8
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 23 Apr 2010 00:21:18 -0700 |
| parents | 577241984307 |
| children | a39e96e3b891 |
| files | src/ChangeLog src/Makefile.in src/s/cygwin.h src/s/hpux10-20.h |
| diffstat | 4 files changed, 10 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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. */
--- 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
--- 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.