Commit 49ebbd65 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

Define LIB_STANDARD and START_FILES using autoconf.

* s/usg5-4.h (LIB_STANDARD):
* s/netbsd.h (START_FILES):
* s/irix6-5.h (LIB_STANDARD):
* s/hpux10-20.h (LIB_STANDARD, START_FILES):
* s/gnu-linux.h (START_FILES, LIB_STANDARD):
* s/freebsd.h (START_FILES):
* s/darwin.h (START_FILES):
* s/cygwin.h (START_FILES):
* s/aix4-2.h (LIB_STANDARD):
* m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
* Makefile.in (STARTFILES): Rename to START_FILES, define using
autoconf, not cpp.

Define START_FILES and LIB_STANDARD using autoconf.
* configure.in (START_FILES, LIB_STANDARD): New definitions, moved
here from src/s/*.h.
(HAVE_CRTIN): Remove, inline logic in the netbsd
START_FILES/LIB_STANDARD computation.
parent 28823648
2010-05-07 Dan Nicolaescu <dann@ics.uci.edu>
Define START_FILES and LIB_STANDARD using autoconf.
* configure.in (START_FILES, LIB_STANDARD): New definitions, moved
here from src/s/*.h.
(HAVE_CRTIN): Remove, inline logic in the netbsd
START_FILES/LIB_STANDARD computation.
2010-05-06 Glenn Morris <rgm@gnu.org> 2010-05-06 Glenn Morris <rgm@gnu.org>
* configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@. * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@.
......
This diff is collapsed.
...@@ -428,12 +428,6 @@ case "${canonical}" in ...@@ -428,12 +428,6 @@ case "${canonical}" in
## NetBSD ports ## NetBSD ports
*-*-netbsd* ) *-*-netbsd* )
opsys=netbsd opsys=netbsd
if test -f /usr/lib/crti.o; then]
dnl The close and open brackets here are because this section is quoted --
dnl see the `changequote' comment above.
AC_DEFINE(HAVE_CRTIN, [], [Define to 1 if you have /usr/lib/crti.o.])
[ fi
case "${canonical}" in case "${canonical}" in
alpha*-*-netbsd*) machine=alpha ;; alpha*-*-netbsd*) machine=alpha ;;
i[3456]86-*-netbsd*) machine=intel386 ;; i[3456]86-*-netbsd*) machine=intel386 ;;
...@@ -841,20 +835,6 @@ AC_LINK_IFELSE([main(){return 0;}], ...@@ -841,20 +835,6 @@ AC_LINK_IFELSE([main(){return 0;}],
LDFLAGS=$late_LDFLAGS LDFLAGS=$late_LDFLAGS
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
LIB_MATH=-lm
case $opsys in
cygwin )
LIB_MATH=
;;
darwin )
## Adding -lm confuses the dynamic linker, so omit it.
LIB_MATH=
;;
esac
AC_SUBST(LIB_MATH)
#### Extract some information from the operating system and machine files. #### Extract some information from the operating system and machine files.
AC_CHECKING([the machine- and system-dependent files to find out AC_CHECKING([the machine- and system-dependent files to find out
...@@ -1038,6 +1018,45 @@ fi ...@@ -1038,6 +1018,45 @@ fi
AC_SUBST(CRT_DIR) AC_SUBST(CRT_DIR)
LIB_MATH=-lm
LIB_STANDARD=
START_FILES=
case $opsys in
cygwin )
LIB_MATH=
START_FILES='ecrt0.o'
;;
darwin )
## Adding -lm confuses the dynamic linker, so omit it.
LIB_MATH=
START_FILES='pre-crt0.o'
;;
freebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
;;
gnu-linux | gnu-kfreebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
;;
hpux10-20 | hpux11 )
LIB_STANDARD=-lc
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
;;
netbsd | openbsd )
if test -f $(CRT_DIR)/crti.o; then
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
else
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
fi
;;
esac
AC_SUBST(LIB_MATH)
AC_SUBST(START_FILES)
dnl This function defintion taken from Gnome 2.0 dnl This function defintion taken from Gnome 2.0
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
...@@ -1409,6 +1428,7 @@ if test "${with_ns}" != no; then ...@@ -1409,6 +1428,7 @@ if test "${with_ns}" != no; then
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
LIB_STANDARD=
fi fi
AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
[AC_MSG_ERROR([`--with-ns' was specified, but the include [AC_MSG_ERROR([`--with-ns' was specified, but the include
...@@ -1441,6 +1461,7 @@ CFLAGS="$tmp_CFLAGS" ...@@ -1441,6 +1461,7 @@ CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS" CPPFLAGS="$tmp_CPPFLAGS"
AC_SUBST(NS_OBJ) AC_SUBST(NS_OBJ)
AC_SUBST(NS_SUPPORT) AC_SUBST(NS_SUPPORT)
AC_SUBST(LIB_STANDARD)
case "${window_system}" in case "${window_system}" in
x11 ) x11 )
......
2010-05-07 Dan Nicolaescu <dann@ics.uci.edu>
Define LIB_STANDARD and START_FILES using autoconf.
* s/usg5-4.h (LIB_STANDARD):
* s/netbsd.h (START_FILES):
* s/irix6-5.h (LIB_STANDARD):
* s/hpux10-20.h (LIB_STANDARD, START_FILES):
* s/gnu-linux.h (START_FILES, LIB_STANDARD):
* s/freebsd.h (START_FILES):
* s/darwin.h (START_FILES):
* s/cygwin.h (START_FILES):
* s/aix4-2.h (LIB_STANDARD):
* m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
* Makefile.in (STARTFILES): Rename to START_FILES, define using
autoconf, not cpp.
2010-05-06 Dan Nicolaescu <dann@ics.uci.edu> 2010-05-06 Dan Nicolaescu <dann@ics.uci.edu>
   
Remove NEED_BSDTTY and NEED_UNISTD_H. Remove NEED_BSDTTY and NEED_UNISTD_H.
......
...@@ -150,6 +150,8 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ ...@@ -150,6 +150,8 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
RUN_TEMACS = `/bin/pwd`/temacs RUN_TEMACS = `/bin/pwd`/temacs
START_FILES = @START_FILES@
# ========================== start of cpp stuff ======================= # ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */ /* From here on, comments must be done in C syntax. */
...@@ -182,17 +184,6 @@ DEPFLAGS = -MMD -MF deps/$*.d ...@@ -182,17 +184,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
do not let it interfere with this file. */ do not let it interfere with this file. */
#undef register #undef register
/* Some machines do not find the standard C libraries in the usual place. */
#ifndef LIB_STANDARD
#define LIB_STANDARD
#endif
/* Under GNUstep, putting libc on the link line causes problems. */
#ifdef NS_IMPL_GNUSTEP
#undef LIB_STANDARD
#define LIB_STANDARD
#endif
/* Some s/SYSTEM.h files define this to request special libraries. */ /* Some s/SYSTEM.h files define this to request special libraries. */
#ifndef LIBS_SYSTEM #ifndef LIBS_SYSTEM
#define LIBS_SYSTEM #define LIBS_SYSTEM
...@@ -212,12 +203,6 @@ DEPFLAGS = -MMD -MF deps/$*.d ...@@ -212,12 +203,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
#define LD_SWITCH_X_SITE #define LD_SWITCH_X_SITE
#endif #endif
#ifdef START_FILES
STARTFILES = START_FILES
#else
STARTFILES =
#endif
#ifdef NS_IMPL_GNUSTEP #ifdef NS_IMPL_GNUSTEP
/* Pull in stuff from GNUstep-make. */ /* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu FOUNDATION_LIB=gnu
...@@ -691,7 +676,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ ...@@ -691,7 +676,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
$(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \ $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \
$(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
@FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
$(GNULIB_VAR) @LIB_MATH@ LIB_STANDARD $(GNULIB_VAR) $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR)
all: emacs${EXEEXT} $(OTHER_FILES) all: emacs${EXEEXT} $(OTHER_FILES)
...@@ -733,7 +718,7 @@ buildobj.h: Makefile ...@@ -733,7 +718,7 @@ buildobj.h: Makefile
echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
/* FIXME LOCALCPP not defined or mentioned anywhere. */ /* FIXME LOCALCPP not defined or mentioned anywhere. */
temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
#ifdef NS_IMPL_GNUSTEP #ifdef NS_IMPL_GNUSTEP
$(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \
...@@ -741,7 +726,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre ...@@ -741,7 +726,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
${obj} ${otherobj} ${LIBES} ${obj} ${otherobj} ${LIBES}
#else #else
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-o temacs ${STARTFILES} ${obj} ${otherobj} \ -o temacs ${START_FILES} ${obj} ${otherobj} \
${LIBES} ${LIBES}
#endif #endif
...@@ -1181,6 +1166,6 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} ...@@ -1181,6 +1166,6 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT}
cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe} cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}
#ifdef AUTO_DEPEND #ifdef AUTO_DEPEND
ALLOBJS=$(STARTFILES) ${obj} ${otherobj} prefix-args.o ALLOBJS=$(START_FILES) ${obj} ${otherobj} prefix-args.o
-include $(ALLOBJS:%.o=deps/%.d) -include $(ALLOBJS:%.o=deps/%.d)
#endif #endif
...@@ -135,9 +135,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -135,9 +135,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <com_err.h> header file. */ /* Define to 1 if you have the <com_err.h> header file. */
#undef HAVE_COM_ERR_H #undef HAVE_COM_ERR_H
/* Define to 1 if you have /usr/lib/crti.o. */
#undef HAVE_CRTIN
/* Define to 1 if using D-Bus. */ /* Define to 1 if using D-Bus. */
#undef HAVE_DBUS #undef HAVE_DBUS
...@@ -318,10 +315,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -318,10 +315,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <kerberos/krb.h> header file. */ /* Define to 1 if you have the <kerberos/krb.h> header file. */
#undef HAVE_KERBEROS_KRB_H #undef HAVE_KERBEROS_KRB_H
/* Define to 1 if `e_text' is member of `krb5_error'. */ /* Define to 1 if `e_text' is a member of `krb5_error'. */
#undef HAVE_KRB5_ERROR_E_TEXT #undef HAVE_KRB5_ERROR_E_TEXT
/* Define to 1 if `text' is member of `krb5_error'. */ /* Define to 1 if `text' is a member of `krb5_error'. */
#undef HAVE_KRB5_ERROR_TEXT #undef HAVE_KRB5_ERROR_TEXT
/* Define to 1 if you have the <krb5.h> header file. */ /* Define to 1 if you have the <krb5.h> header file. */
...@@ -609,25 +606,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -609,25 +606,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `strsignal' function. */ /* Define to 1 if you have the `strsignal' function. */
#undef HAVE_STRSIGNAL #undef HAVE_STRSIGNAL
/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */ /* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_ADDR #undef HAVE_STRUCT_IFREQ_IFR_ADDR
/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */ /* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR
/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */ /* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_FLAGS #undef HAVE_STRUCT_IFREQ_IFR_FLAGS
/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */ /* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_HWADDR #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */ /* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_NETMASK #undef HAVE_STRUCT_IFREQ_IFR_NETMASK
/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ /* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */
#undef HAVE_STRUCT_NLIST_N_UN_N_NAME #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
/* Define to 1 if `tm_zone' is member of `struct tm'. */ /* Define to 1 if `tm_zone' is a member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE #undef HAVE_STRUCT_TM_TM_ZONE
/* Define to 1 if `struct utimbuf' is declared by <utime.h>. */ /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
...@@ -850,6 +847,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -850,6 +847,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
...@@ -906,6 +906,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -906,6 +906,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using the Motif X toolkit. */ /* Define to 1 if using the Motif X toolkit. */
#undef USE_MOTIF #undef USE_MOTIF
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if we should use toolkit scroll bars. */ /* Define to 1 if we should use toolkit scroll bars. */
#undef USE_TOOLKIT_SCROLL_BARS #undef USE_TOOLKIT_SCROLL_BARS
...@@ -941,28 +963,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -941,28 +963,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you need to in order for `stat' and other things to work. */ /* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to rpl_ if the getopt replacement functions and variables should be /* Define to rpl_ if the getopt replacement functions and variables should be
used. */ used. */
#undef __GETOPT_PREFIX #undef __GETOPT_PREFIX
......
...@@ -36,7 +36,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -36,7 +36,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef ADDR_CORRECT #undef ADDR_CORRECT
#define ADDR_CORRECT(x) ((int)(x)) #define ADDR_CORRECT(x) ((int)(x))
#define START_FILES
/*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/ /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
#define BROKEN_FIONREAD #define BROKEN_FIONREAD
/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h. /* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
......
...@@ -87,10 +87,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -87,10 +87,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define LINKER cc #define LINKER cc
#endif #endif
/* No need to specify -lc when linking. */
#define LIB_STANDARD
/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless /* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
on older versions of X where it happens to exist. */ on older versions of X where it happens to exist. */
#ifdef HAVE_LIBPTHREADS #ifdef HAVE_LIBPTHREADS
......
...@@ -134,11 +134,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -134,11 +134,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Don't link against static libgcc */ /* Don't link against static libgcc */
#define LIB_GCC #define LIB_GCC
/* Don't list system libs on link command line */
#define LIB_STANDARD
#define START_FILES ecrt0.o
/* the end */ /* the end */
/* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
......
...@@ -155,8 +155,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -155,8 +155,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define UNEXEC unexmacosx.o #define UNEXEC unexmacosx.o
#define START_FILES pre-crt0.o
/* start_of_text isn't actually used, so make it compile without error. */ /* start_of_text isn't actually used, so make it compile without error. */
#define TEXT_START (0) #define TEXT_START (0)
......
...@@ -46,8 +46,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -46,8 +46,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
there, contrary to what a stock GCC would do. */ there, contrary to what a stock GCC would do. */
#define LD_SWITCH_SYSTEM -L/usr/local/lib #define LD_SWITCH_SYSTEM -L/usr/local/lib
#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o
#undef LIB_GCC #undef LIB_GCC
#define LIB_GCC #define LIB_GCC
......
...@@ -169,8 +169,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -169,8 +169,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Ask GCC where to find libgcc.a. */ /* Ask GCC where to find libgcc.a. */
#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
that says where to find X windows at run time. */ that says where to find X windows at run time. */
...@@ -190,7 +188,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -190,7 +188,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef LIB_GCC #undef LIB_GCC
#define LIB_GCC #define LIB_GCC
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
#ifdef HAVE_LIBNCURSES #ifdef HAVE_LIBNCURSES
#define TERMINFO #define TERMINFO
......
...@@ -131,7 +131,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -131,7 +131,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define LIBS_SYSTEM -l:libdld.sl #define LIBS_SYSTEM -l:libdld.sl
#define LIB_STANDARD -lc
/* Rainer Malzbender <rainer@displaytech.com> says definining /* Rainer Malzbender <rainer@displaytech.com> says definining
HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
...@@ -160,8 +159,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -160,8 +159,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define NO_REMAP #define NO_REMAP
#define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o
/* Define VIRT_ADDR_VARIES if the virtual addresses of /* Define VIRT_ADDR_VARIES if the virtual addresses of
pure and impure space as loaded can vary, and even their pure and impure space as loaded can vary, and even their
relative order cannot be relied on. relative order cannot be relied on.
......
...@@ -27,10 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -27,10 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define SETPGRP_RELEASES_CTTY #define SETPGRP_RELEASES_CTTY
#ifdef LIB_STANDARD
#undef LIB_STANDARD
#endif
#ifdef SYSTEM_TYPE #ifdef SYSTEM_TYPE
#undef SYSTEM_TYPE #undef SYSTEM_TYPE
#endif #endif
......
...@@ -28,19 +28,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -28,19 +28,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define LIBS_TERMCAP -ltermcap #define LIBS_TERMCAP -ltermcap
#define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o START_FILES_1 $(CRT_DIR)/crtbegin.o
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o END_FILES_1
#undef LIB_GCC #undef LIB_GCC
#define LIB_GCC #define LIB_GCC
#ifdef HAVE_CRTIN
#define START_FILES_1 $(CRT_DIR)/crti.o
#define END_FILES_1 $(CRT_DIR)/crtn.o
#else
#define START_FILES_1
#define END_FILES_1
#endif
#define AMPERSAND_FULL_NAME #define AMPERSAND_FULL_NAME
/* LD_SWITCH_X_SITE_AUX_RPATH gives a -rpath option (which is what /* LD_SWITCH_X_SITE_AUX_RPATH gives a -rpath option (which is what
......
...@@ -97,8 +97,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -97,8 +97,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define ORDINARY_LINK #define ORDINARY_LINK
#define LIB_STANDARD
/* Undump with ELF */ /* Undump with ELF */
#undef COFF #undef COFF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment