|
 |
bde42a4 |
To: vim_dev@googlegroups.com
|
|
|
bde42a4 |
Subject: Patch 7.3.368
|
|
|
bde42a4 |
Fcc: outbox
|
|
|
bde42a4 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
bde42a4 |
Mime-Version: 1.0
|
|
|
bde42a4 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bde42a4 |
Content-Transfer-Encoding: 8bit
|
|
|
bde42a4 |
------------
|
|
|
bde42a4 |
|
|
|
bde42a4 |
Patch 7.3.368
|
|
|
bde42a4 |
Problem: Gcc complains about redefining _FORTIFY_SOURCE.
|
|
|
bde42a4 |
Solution: Undefine it before redefining it.
|
|
|
bde42a4 |
Files: src/Makefile, src/configure.in, src/auto/configure
|
|
|
bde42a4 |
|
|
|
bde42a4 |
|
|
|
bde42a4 |
*** ../vim-7.3.367/src/Makefile 2011-10-20 16:35:25.000000000 +0200
|
|
|
bde42a4 |
--- src/Makefile 2011-12-08 15:16:13.000000000 +0100
|
|
|
bde42a4 |
***************
|
|
|
bde42a4 |
*** 561,568 ****
|
|
|
bde42a4 |
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
|
|
|
bde42a4 |
|
|
|
bde42a4 |
# Use this with GCC to check for mistakes, unused arguments, etc.
|
|
|
bde42a4 |
! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1
|
|
|
bde42a4 |
! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG
|
|
|
bde42a4 |
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
|
|
|
bde42a4 |
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
|
|
|
bde42a4 |
|
|
|
bde42a4 |
--- 561,568 ----
|
|
|
bde42a4 |
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
|
|
|
bde42a4 |
|
|
|
bde42a4 |
# Use this with GCC to check for mistakes, unused arguments, etc.
|
|
|
bde42a4 |
! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
|
|
|
bde42a4 |
! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
|
|
|
bde42a4 |
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
|
|
|
bde42a4 |
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
|
|
|
bde42a4 |
|
|
|
bde42a4 |
*** ../vim-7.3.367/src/configure.in 2011-09-02 12:27:20.000000000 +0200
|
|
|
bde42a4 |
--- src/configure.in 2011-12-01 20:23:22.000000000 +0100
|
|
|
bde42a4 |
***************
|
|
|
bde42a4 |
*** 3584,3592 ****
|
|
|
bde42a4 |
dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
|
|
|
bde42a4 |
dnl declared as char x[1] but actually longer. Introduced in gcc 4.0.
|
|
|
bde42a4 |
dnl Also remove duplicate _FORTIFY_SOURCE arguments.
|
|
|
bde42a4 |
AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
|
|
|
bde42a4 |
if test "$gccmajor" -gt "3"; then
|
|
|
bde42a4 |
! CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
|
|
|
bde42a4 |
AC_MSG_RESULT(yes)
|
|
|
bde42a4 |
else
|
|
|
bde42a4 |
AC_MSG_RESULT(no)
|
|
|
bde42a4 |
--- 3584,3593 ----
|
|
|
bde42a4 |
dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
|
|
|
bde42a4 |
dnl declared as char x[1] but actually longer. Introduced in gcc 4.0.
|
|
|
bde42a4 |
dnl Also remove duplicate _FORTIFY_SOURCE arguments.
|
|
|
bde42a4 |
+ dnl And undefine it first to avoid a warning.
|
|
|
bde42a4 |
AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
|
|
|
bde42a4 |
if test "$gccmajor" -gt "3"; then
|
|
|
bde42a4 |
! CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
|
|
|
bde42a4 |
AC_MSG_RESULT(yes)
|
|
|
bde42a4 |
else
|
|
|
bde42a4 |
AC_MSG_RESULT(no)
|
|
|
bde42a4 |
*** ../vim-7.3.367/src/auto/configure 2011-09-02 12:27:20.000000000 +0200
|
|
|
bde42a4 |
--- src/auto/configure 2011-12-01 20:24:02.000000000 +0100
|
|
|
bde42a4 |
***************
|
|
|
bde42a4 |
*** 12483,12492 ****
|
|
|
bde42a4 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
bde42a4 |
$as_echo "no" >&6; }
|
|
|
bde42a4 |
fi
|
|
|
bde42a4 |
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
|
|
|
bde42a4 |
$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
|
|
|
bde42a4 |
if test "$gccmajor" -gt "3"; then
|
|
|
bde42a4 |
! CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
|
|
|
bde42a4 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
bde42a4 |
$as_echo "yes" >&6; }
|
|
|
bde42a4 |
else
|
|
|
bde42a4 |
--- 12483,12492 ----
|
|
|
bde42a4 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
bde42a4 |
$as_echo "no" >&6; }
|
|
|
bde42a4 |
fi
|
|
|
bde42a4 |
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
|
|
|
bde42a4 |
$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
|
|
|
bde42a4 |
if test "$gccmajor" -gt "3"; then
|
|
|
bde42a4 |
! CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
|
|
|
bde42a4 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
bde42a4 |
$as_echo "yes" >&6; }
|
|
|
bde42a4 |
else
|
|
|
bde42a4 |
*** ../vim-7.3.367/src/version.c 2011-12-08 15:14:04.000000000 +0100
|
|
|
bde42a4 |
--- src/version.c 2011-12-08 15:15:13.000000000 +0100
|
|
|
bde42a4 |
***************
|
|
|
bde42a4 |
*** 716,717 ****
|
|
|
bde42a4 |
--- 716,719 ----
|
|
|
bde42a4 |
{ /* Add new patch number below this line */
|
|
|
bde42a4 |
+ /**/
|
|
|
bde42a4 |
+ 368,
|
|
|
bde42a4 |
/**/
|
|
|
bde42a4 |
|
|
|
bde42a4 |
--
|
|
|
bde42a4 |
hundred-and-one symptoms of being an internet addict:
|
|
|
bde42a4 |
248. You sign your letters with your e-mail address instead of your name.
|
|
|
bde42a4 |
|
|
|
bde42a4 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
bde42a4 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
bde42a4 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
bde42a4 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|