|
Line
Link Here
|
| 0 |
-- emacs-22.3-orig/configure.in |
0 |
++ emacs-22.3/configure.in |
|
Lines 129-134
Link Here
|
| 129 |
specify install directory for Emacs.app on Mac OS X]], |
129 |
specify install directory for Emacs.app on Mac OS X]], |
| 130 |
[ carbon_appdir_x=${enableval}]) |
130 |
[ carbon_appdir_x=${enableval}]) |
| 131 |
|
131 |
|
|
|
132 |
CRT_DIR= |
| 133 |
AC_ARG_WITH([crt-dir],dnl |
| 134 |
[AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc. |
| 135 |
This option is only used on x86-64 and s390x GNU/Linux architectures.])]) |
| 136 |
CRT_DIR="${with_crt_dir}" |
| 137 |
|
| 132 |
AC_ARG_ENABLE(asserts, |
138 |
AC_ARG_ENABLE(asserts, |
| 133 |
[ --enable-asserts compile code with asserts enabled], |
139 |
[ --enable-asserts compile code with asserts enabled], |
| 134 |
USE_XASSERTS=$enableval, |
140 |
USE_XASSERTS=$enableval, |
|
Lines 1564-1578
Link Here
|
| 1564 |
AC_SYS_LARGEFILE |
1570 |
AC_SYS_LARGEFILE |
| 1565 |
|
1571 |
|
| 1566 |
|
1572 |
|
| 1567 |
### The standard library on x86-64 GNU/Linux distributions can |
1573 |
## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x. |
| 1568 |
### be located in either /usr/lib64 or /usr/lib. |
1574 |
## Other machine types hard-code the location in src/[ms]/*.h. |
| 1569 |
case "${canonical}" in |
1575 |
case "${canonical}" in |
| 1570 |
x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) |
1576 |
x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) |
| 1571 |
if test -d /usr/lib64; then |
1577 |
|
| 1572 |
AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1, |
1578 |
## On x86-64 and s390x GNU/Linux distributions, the standard library |
| 1573 |
[Define to 1 if the file /usr/lib64 exists.]) |
1579 |
## can be in a variety of places. We only try /usr/lib64 and /usr/lib. |
| 1574 |
fi |
1580 |
## For anything else (eg /usr/lib32), it is up the user to specify |
|
|
1581 |
## the location (bug#5655). |
| 1582 |
## Test for crtn.o, not just the directory, because sometimes the |
| 1583 |
## directory exists but does not have the relevant files (bug#1287). |
| 1584 |
## If user specified a crt-dir, use that unconditionally. |
| 1585 |
if test "X$CRT_DIR" = "X"; then |
| 1586 |
CRT_DIR=/usr/lib |
| 1587 |
test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64 |
| 1588 |
fi |
| 1589 |
|
| 1590 |
test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \ |
| 1591 |
AC_MSG_ERROR([crt*.o not found. Use --with-crt-dir to specify the location.]) |
| 1592 |
;; |
| 1593 |
|
| 1575 |
esac |
1594 |
esac |
|
|
1595 |
test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib |
| 1596 |
AC_SUBST(CRT_DIR) |
| 1597 |
|
| 1576 |
|
1598 |
|
| 1577 |
dnl This function defintion taken from Gnome 2.0 |
1599 |
dnl This function defintion taken from Gnome 2.0 |
| 1578 |
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) |
1600 |
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) |
| 1579 |
-- emacs-22.3-orig/src/m/amdx86-64.h |
1601 |
++ emacs-22.3/src/m/amdx86-64.h |
|
Lines 109-115
Link Here
|
| 109 |
a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib. */ |
109 |
a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib. */ |
| 110 |
|
110 |
|
| 111 |
#undef START_FILES |
111 |
#undef START_FILES |
| 112 |
#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o |
112 |
#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 113 |
|
113 |
|
| 114 |
/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
114 |
/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
| 115 |
The reason is that some functions in libgcc.a call functions from libc.a, |
115 |
The reason is that some functions in libgcc.a call functions from libc.a, |
|
Lines 117-130
Link Here
|
| 117 |
versions of ld are one-pass linkers, we need to mention -lgcc twice, |
117 |
versions of ld are one-pass linkers, we need to mention -lgcc twice, |
| 118 |
or else we risk getting unresolved externals. */ |
118 |
or else we risk getting unresolved externals. */ |
| 119 |
#undef LIB_STANDARD |
119 |
#undef LIB_STANDARD |
| 120 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o |
120 |
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 121 |
|
121 |
|
| 122 |
#elif defined(__OpenBSD__) |
122 |
#elif defined(__OpenBSD__) |
| 123 |
|
123 |
|
| 124 |
#undef START_FILES |
124 |
#undef START_FILES |
| 125 |
#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o |
125 |
#define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o |
| 126 |
#undef LIB_STANDARD |
126 |
#undef LIB_STANDARD |
| 127 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o |
127 |
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o |
| 128 |
|
128 |
|
| 129 |
#elif defined(__NetBSD__) |
129 |
#elif defined(__NetBSD__) |
| 130 |
|
130 |
|
|
Lines 138-148
Link Here
|
| 138 |
#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */ |
138 |
#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */ |
| 139 |
|
139 |
|
| 140 |
#undef START_FILES |
140 |
#undef START_FILES |
| 141 |
#ifdef HAVE_X86_64_LIB64_DIR |
141 |
#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 142 |
#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o |
|
|
| 143 |
#else |
| 144 |
#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o |
| 145 |
#endif |
| 146 |
|
142 |
|
| 147 |
/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
143 |
/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
| 148 |
The reason is that some functions in libgcc.a call functions from libc.a, |
144 |
The reason is that some functions in libgcc.a call functions from libc.a, |
|
Lines 150-160
Link Here
|
| 150 |
versions of ld are one-pass linkers, we need to mention -lgcc twice, |
146 |
versions of ld are one-pass linkers, we need to mention -lgcc twice, |
| 151 |
or else we risk getting unresolved externals. */ |
147 |
or else we risk getting unresolved externals. */ |
| 152 |
#undef LIB_STANDARD |
148 |
#undef LIB_STANDARD |
| 153 |
#ifdef HAVE_X86_64_LIB64_DIR |
149 |
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 154 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o |
|
|
| 155 |
#else |
| 156 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o |
| 157 |
#endif |
| 158 |
|
150 |
|
| 159 |
#endif /* __FreeBSD__ */ |
151 |
#endif /* __FreeBSD__ */ |
| 160 |
|
152 |
|
| 161 |
-- emacs-22.3-orig/src/m/ibms390x.h |
153 |
++ emacs-22.3/src/m/ibms390x.h |
|
Lines 161-178
Link Here
|
| 161 |
#define XPNTR(a) XUINT (a) |
161 |
#define XPNTR(a) XUINT (a) |
| 162 |
|
162 |
|
| 163 |
#undef START_FILES |
163 |
#undef START_FILES |
| 164 |
#ifdef HAVE_X86_64_LIB64_DIR |
164 |
#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o |
| 165 |
#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o |
|
|
| 166 |
#else |
| 167 |
#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o |
| 168 |
#endif |
| 169 |
|
165 |
|
| 170 |
#undef LIB_STANDARD |
166 |
#undef LIB_STANDARD |
| 171 |
#ifdef HAVE_X86_64_LIB64_DIR |
167 |
#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
| 172 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o |
|
|
| 173 |
#else |
| 174 |
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o |
| 175 |
#endif |
| 176 |
|
168 |
|
| 177 |
/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 |
169 |
/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 |
| 178 |
(do not change this comment) */ |
170 |
(do not change this comment) */ |
| 179 |
-- emacs-22.3-orig/src/Makefile.in |
171 |
++ emacs-22.3/src/Makefile.in |
|
Lines 63-68
Link Here
|
| 63 |
S_FILE = ${srcdir}/@opsysfile@ |
63 |
S_FILE = ${srcdir}/@opsysfile@ |
| 64 |
config_h = config.h $(M_FILE) $(S_FILE) |
64 |
config_h = config.h $(M_FILE) $(S_FILE) |
| 65 |
|
65 |
|
|
|
66 |
## Only used by amdx86-64 and ibms390x GNU/Linux. |
| 67 |
CRT_DIR=@CRT_DIR@ |
| 68 |
|
| 66 |
# ========================== start of cpp stuff ======================= |
69 |
# ========================== start of cpp stuff ======================= |
| 67 |
/* From here on, comments must be done in C syntax. */ |
70 |
/* From here on, comments must be done in C syntax. */ |
| 68 |
|
71 |
|
