diff options
| author | Glenn Morris | 2010-04-23 19:30:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-04-23 19:30:11 -0700 |
| commit | 48cd4175158c8f2da2f97df6b3b8dd0e0e59d9c4 (patch) | |
| tree | de8b135c67a26957a8bf17a1569f3fb34574430e /src/m | |
| parent | 0c309b800cde56aafeed87c0ca8ee0b2b8dcdb61 (diff) | |
| download | emacs-48cd4175158c8f2da2f97df6b3b8dd0e0e59d9c4.tar.gz emacs-48cd4175158c8f2da2f97df6b3b8dd0e0e59d9c4.zip | |
Accidentally omitted from previous commit.
* src/m/amdx86-64.h (START_FILES, LIB_STANDARD):
Use $CRT_DIR rather than HAVE_LIB64_DIR. (Bug#5655)
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/amdx86-64.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 4bea30d12de..0401b8bf90f 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h | |||
| @@ -80,7 +80,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 80 | a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib. */ | 80 | a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib. */ |
| 81 | 81 | ||
| 82 | #undef START_FILES | 82 | #undef START_FILES |
| 83 | #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o | 83 | #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 84 | 84 | ||
| 85 | /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. | 85 | /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
| 86 | The reason is that some functions in libgcc.a call functions from libc.a, | 86 | The reason is that some functions in libgcc.a call functions from libc.a, |
| @@ -88,14 +88,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 88 | versions of ld are one-pass linkers, we need to mention -lgcc twice, | 88 | versions of ld are one-pass linkers, we need to mention -lgcc twice, |
| 89 | or else we risk getting unresolved externals. */ | 89 | or else we risk getting unresolved externals. */ |
| 90 | #undef LIB_STANDARD | 90 | #undef LIB_STANDARD |
| 91 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o | 91 | #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 92 | 92 | ||
| 93 | #elif defined(__OpenBSD__) | 93 | #elif defined(__OpenBSD__) |
| 94 | 94 | ||
| 95 | #undef START_FILES | 95 | #undef START_FILES |
| 96 | #define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o | 96 | #define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o |
| 97 | #undef LIB_STANDARD | 97 | #undef LIB_STANDARD |
| 98 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o | 98 | #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o |
| 99 | 99 | ||
| 100 | #elif defined(__NetBSD__) | 100 | #elif defined(__NetBSD__) |
| 101 | 101 | ||
| @@ -119,13 +119,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 119 | or else we risk getting unresolved externals. */ | 119 | or else we risk getting unresolved externals. */ |
| 120 | #undef START_FILES | 120 | #undef START_FILES |
| 121 | #undef LIB_STANDARD | 121 | #undef LIB_STANDARD |
| 122 | #ifdef HAVE_LIB64_DIR | 122 | #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 123 | #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o | 123 | #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 124 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o | ||
| 125 | #else | ||
| 126 | #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o | ||
| 127 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o | ||
| 128 | #endif | ||
| 129 | 124 | ||
| 130 | #endif /* __FreeBSD__ */ | 125 | #endif /* __FreeBSD__ */ |
| 131 | #endif /* !i386 */ | 126 | #endif /* !i386 */ |