aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorGlenn Morris2010-05-18 19:42:04 -0700
committerGlenn Morris2010-05-18 19:42:04 -0700
commitc1d0dcfd127b3f9742c31f794e2a6d886048bb1e (patch)
tree1d070669e258b1bc4ea5507fb58149ca1d6ee685 /src/s
parent7f34aec377794208fb4aecda44c49ff9f11e7d86 (diff)
downloademacs-c1d0dcfd127b3f9742c31f794e2a6d886048bb1e.tar.gz
emacs-c1d0dcfd127b3f9742c31f794e2a6d886048bb1e.zip
Set linker-related things with configure.
* configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables. (ORDINARY_LINK): New AC_DEFINE. (LIB_GCC): No need to set if ORDINARY_LINK. * src/Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp. (GNULIB_VAR): Remove. (LIBES): Use LIB_GCC instead of GNULIB_VAR. * src/m/ibms390x.h (LINKER): * src/m/macppc.h (LINKER) [GNU_LINUX]: * src/s/aix4-2.h (ORDINARY_LINK): * src/s/cygwin.h (LINKER): * src/s/darwin.h (ORDINARY_LINK): * src/s/gnu.h (ORDINARY_LINK): * src/s/netbsd.h (LINKER): * src/s/usg5-4.h (ORDINARY_LINK): Move to configure. * msdos/sed1v2.inp (LD): Edit to $(CC). (YMF_PASS_LDFLAGS): Edit to `flags'.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/aix4-2.h2
-rw-r--r--src/s/cygwin.h5
-rw-r--r--src/s/darwin.h3
-rw-r--r--src/s/gnu.h3
-rw-r--r--src/s/netbsd.h6
-rw-r--r--src/s/usg5-4.h2
6 files changed, 3 insertions, 18 deletions
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 9963e5744bf..5212c432843 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -106,7 +106,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
106 106
107#define UNEXEC unexaix.o 107#define UNEXEC unexaix.o
108 108
109#define ORDINARY_LINK
110
111/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562 109/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
112 (do not change this comment) */ 110 (do not change this comment) */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index e2afb7ddc44..b6d0c7c88ff 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,7 +1,7 @@
1/* System description header file for Cygwin. 1/* System description header file for Cygwin.
2 2
3Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, 3Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006,
4 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* SYSTEM_TYPE should indicate the kind of system you are using. 21/* SYSTEM_TYPE should indicate the kind of system you are using.
22 It sets the Lisp variable system-type. */ 22 It sets the Lisp variable system-type. */
23#define SYSTEM_TYPE "cygwin" 23#define SYSTEM_TYPE "cygwin"
24 24
25/* Emacs can read input using SIGIO and buffering characters itself, 25/* Emacs can read input using SIGIO and buffering characters itself,
@@ -94,7 +94,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
94#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) 94#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
95#define SYSV_SYSTEM_DIR 1 95#define SYSV_SYSTEM_DIR 1
96#define UNEXEC unexcw.o 96#define UNEXEC unexcw.o
97#define LINKER $(CC)
98 97
99#define HAVE_SOCKETS 98#define HAVE_SOCKETS
100 99
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 76c0054cd3f..a30360576a8 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -147,9 +147,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
147#undef HAVE_POSIX_MEMALIGN 147#undef HAVE_POSIX_MEMALIGN
148#endif 148#endif
149 149
150/* Link this program just by running cc. */
151#define ORDINARY_LINK
152
153/* Define the following so emacs symbols will not conflict with those 150/* Define the following so emacs symbols will not conflict with those
154 in the System framework. Otherwise -prebind will not work. */ 151 in the System framework. Otherwise -prebind will not work. */
155 152
diff --git a/src/s/gnu.h b/src/s/gnu.h
index cb4c4a9d807..4567f4e9f4f 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -29,8 +29,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
29 29
30#define SIGNALS_VIA_CHARACTERS 30#define SIGNALS_VIA_CHARACTERS
31 31
32/* GNU needs its own crt0, and libc defines data_start. */ 32/* libc defines data_start. */
33#define ORDINARY_LINK
34#define DATA_START ({ extern int data_start; (char *) &data_start; }) 33#define DATA_START ({ extern int data_start; (char *) &data_start; })
35 34
36/* Some losing code fails to include this and then assumes 35/* Some losing code fails to include this and then assumes
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 4874ec9af56..af8fd00a6bd 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -26,12 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
26 26
27#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) 27#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
28 28
29/* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
30 the library search parth, i.e. it won't search /usr/lib
31 for libc and friends. Using -nostartfiles instead avoids
32 this problem, and will also work on earlier NetBSD releases. */
33#define LINKER $(CC) -nostartfiles
34
35#define DEFAULT_SOUND_DEVICE "/dev/audio" 29#define DEFAULT_SOUND_DEVICE "/dev/audio"
36 30
37/* Greg A. Woods <woods@weird.com> says we must include signal.h 31/* Greg A. Woods <woods@weird.com> says we must include signal.h
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index f870086368c..85499fb1124 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -69,8 +69,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
69/* On USG systems signal handlers return void. */ 69/* On USG systems signal handlers return void. */
70#define SIGTYPE void 70#define SIGTYPE void
71 71
72#define ORDINARY_LINK
73
74/* Undump with ELF. */ 72/* Undump with ELF. */
75#undef COFF 73#undef COFF
76 74