1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00

auto upstream

This commit is contained in:
Joakim Verona 2012-12-26 06:51:30 +01:00
commit 33d58dfa55
2 changed files with 10 additions and 14 deletions

View File

@ -1,3 +1,10 @@
2012-12-26 Paul Eggert <eggert@cs.ucla.edu>
Revert static checking of stack smashing.
* configure.ac (WARN_CFLAGS): Omit -Wstack-protector when
configured with --enable-gcc-warnings. -Wstack-protector causes
diagnostics to be issued on Ubuntu 12.10 x86-64.
2012-12-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:

View File

@ -729,23 +729,12 @@ else
# <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
nw="$nw -Wshadow"
# Emacs's use of alloca inhibits protecting the stack.
nw="$nw -Wstack-protector"
# The following line should be removable at some point.
nw="$nw -Wsuggest-attribute=pure"
AC_MSG_CHECKING([whether to use -Wstack-protector])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM(
[[#if (1 <= __LONG_MAX__ >> 31 >> 31 \
&& 4 < __GNUC__ + (7 < __GNUC_MINOR__ + (2 <= __GNUC_PATCHLEVEL__)))
/* OK */
#else
#error "Not GCC, or GCC before 4.7.2, or 'long int' has < 64 bits."
#endif
]])],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
nw="$nw -Wstack-protector"])
gl_MANYWARN_ALL_GCC([ws])
gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
for w in $ws; do