diff options
| author | Paul Eggert | 2018-06-15 14:37:39 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-06-15 14:38:26 -0700 |
| commit | c2b20948fbe1dbb4be76c477e66cf120797417ff (patch) | |
| tree | bacb7fe9bdcb7dc61cbeff2b5eb36c48524d6232 | |
| parent | dec54ec0c067535c87371b1f7942941b90765647 (diff) | |
| download | emacs-c2b20948fbe1dbb4be76c477e66cf120797417ff.tar.gz emacs-c2b20948fbe1dbb4be76c477e66cf120797417ff.zip | |
Remove old combreloc hack
It has not been needed for many years and gets in the way of
portable dumping, address sanitization, etc. See:
https://lists.gnu.org/r/emacs-devel/2016-12/msg00147.html
* configure.ac (LDFLAGS_NOCOMBRELOC, emacs_cv_znocombreloc):
Remove. All uses removed.
* etc/PROBLEMS: Remove discussion of combreloc problems.
| -rw-r--r-- | configure.ac | 35 | ||||
| -rw-r--r-- | etc/PROBLEMS | 12 |
2 files changed, 0 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index eddeb5073c9..4fcb846c608 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1333,39 +1333,6 @@ else | |||
| 1333 | ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" | 1333 | ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" |
| 1334 | fi | 1334 | fi |
| 1335 | 1335 | ||
| 1336 | dnl We need -znocombreloc if we're using a relatively recent GNU ld. | ||
| 1337 | dnl If we can link with the flag, it shouldn't do any harm anyhow. | ||
| 1338 | dnl Treat GCC specially since it just gives a non-fatal 'unrecognized option' | ||
| 1339 | dnl if not built to support GNU ld. | ||
| 1340 | |||
| 1341 | dnl For a long time, -znocombreloc was added to LDFLAGS rather than | ||
| 1342 | dnl LD_SWITCH_SYSTEM_TEMACS. That is: | ||
| 1343 | dnl * inappropriate, as LDFLAGS is a user option but this is essential. | ||
| 1344 | dnl Eg "make LDFLAGS=... all" could run into problems, | ||
| 1345 | dnl https://bugs.debian.org/684788 | ||
| 1346 | dnl * unnecessary, since temacs is the only thing that actually needs it. | ||
| 1347 | dnl Indeed this is where it was originally, prior to: | ||
| 1348 | dnl https://lists.gnu.org/r/emacs-pretest-bug/2004-03/msg00170.html | ||
| 1349 | if test x$GCC = xyes; then | ||
| 1350 | LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc" | ||
| 1351 | else | ||
| 1352 | LDFLAGS_NOCOMBRELOC="-znocombreloc" | ||
| 1353 | fi | ||
| 1354 | |||
| 1355 | AC_CACHE_CHECK([for -znocombreloc], [emacs_cv_znocombreloc], | ||
| 1356 | [late_LDFLAGS="$LDFLAGS" | ||
| 1357 | LDFLAGS="$LDFLAGS $LDFLAGS_NOCOMBRELOC" | ||
| 1358 | |||
| 1359 | AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], | ||
| 1360 | [emacs_cv_znocombreloc=yes], [emacs_cv_znocombreloc=no]) | ||
| 1361 | |||
| 1362 | LDFLAGS="$late_LDFLAGS"]) | ||
| 1363 | |||
| 1364 | if test x$emacs_cv_znocombreloc = xno; then | ||
| 1365 | LDFLAGS_NOCOMBRELOC= | ||
| 1366 | fi | ||
| 1367 | |||
| 1368 | |||
| 1369 | AC_CACHE_CHECK([whether addresses are sanitized], | 1336 | AC_CACHE_CHECK([whether addresses are sanitized], |
| 1370 | [emacs_cv_sanitize_address], | 1337 | [emacs_cv_sanitize_address], |
| 1371 | [AC_COMPILE_IFELSE( | 1338 | [AC_COMPILE_IFELSE( |
| @@ -5341,8 +5308,6 @@ if test x$ac_enable_profiling != x ; then | |||
| 5341 | esac | 5308 | esac |
| 5342 | fi | 5309 | fi |
| 5343 | 5310 | ||
| 5344 | LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS" | ||
| 5345 | |||
| 5346 | AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) | 5311 | AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) |
| 5347 | 5312 | ||
| 5348 | ## Common for all window systems | 5313 | ## Common for all window systems |
diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 5a8618f71e8..fe59b52c759 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS | |||
| @@ -192,18 +192,6 @@ Upgrading to a newer version of Exceed has been reported to prevent | |||
| 192 | these crashes. You should consider switching to a free X server, such | 192 | these crashes. You should consider switching to a free X server, such |
| 193 | as Xming or Cygwin/X. | 193 | as Xming or Cygwin/X. |
| 194 | 194 | ||
| 195 | ** Emacs crashes with SIGSEGV in XtInitializeWidgetClass. | ||
| 196 | |||
| 197 | It crashes on X, but runs fine when called with option "-nw". | ||
| 198 | |||
| 199 | This has been observed when Emacs is linked with GNU ld but without passing | ||
| 200 | the -z nocombreloc flag. Emacs normally knows to pass the -z nocombreloc | ||
| 201 | flag when needed, so if you come across a situation where the flag is | ||
| 202 | necessary but missing, please report it via M-x report-emacs-bug. | ||
| 203 | |||
| 204 | On platforms such as Solaris, you can also work around this problem by | ||
| 205 | configuring your compiler to use the native linker instead of GNU ld. | ||
| 206 | |||
| 207 | ** When Emacs is compiled with Gtk+, closing a display kills Emacs. | 195 | ** When Emacs is compiled with Gtk+, closing a display kills Emacs. |
| 208 | 196 | ||
| 209 | There is a long-standing bug in GTK that prevents it from recovering | 197 | There is a long-standing bug in GTK that prevents it from recovering |