aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1517: MacOS: configure removes -O2 from $CFLAGS

Browse Source 
Problem:    MacOS: configure removes -O2 from $CFLAGS.
Solution:   Only adjust $CFLAGS for gcc. (closes #12351)
This commit is contained in:
Rose 2023-05-06 18:07:14 +01:00 committed by Bram Moolenaar
parent 3ab3a86481
commit 00d07e7682
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/auto/configure vendored
View File

@ -4477,12 +4477,14 @@ if test -z "$CFLAGS"; then
CFLAGS="-O" CFLAGS="-O"
test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall -Wno-deprecated-declarations" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall -Wno-deprecated-declarations"
fi fi
if test "$GCC" = yes; then if test "$GCC" = yes; then
gccversion=`$CC -dumpversion` gccversion=`$CC -dumpversion`
if test "x$gccversion" = "x"; then if test "x$gccversion" = "x"; then
gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'` gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
fi fi
if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'`
else else
@ -4777,11 +4779,6 @@ rm -f core conftest.err conftest.$ac_objext \
with_x=no with_x=no
fi fi
fi fi
if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }

17
src/configure.ac
View File

@ -93,14 +93,19 @@ if test -z "$CFLAGS"; then
CFLAGS="-O" CFLAGS="-O"
test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall -Wno-deprecated-declarations" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall -Wno-deprecated-declarations"
fi fi
if test "$GCC" = yes; then if test "$GCC" = yes; then
dnl method that should work for nearly all versions dnl Method that should work for nearly all gcc versions.
gccversion=`$CC -dumpversion` gccversion=`$CC -dumpversion`
if test "x$gccversion" = "x"; then if test "x$gccversion" = "x"; then
dnl old method; fall-back for when -dumpversion doesn't work dnl old method; fall-back for when -dumpversion doesn't work
gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
fi fi
dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
dnl Gcc version 4.0.1 was reported to cause trouble on Macintosh by Marcin
dnl Dalecki. For Mac with Intel the symptom reported is: malloc() reports
dnl double free. This happens in expand_filename(), because the optimizer
dnl swaps two blocks of code, both using "repl", that can't be swapped.
if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"' echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"'
CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'` CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'`
@ -299,14 +304,6 @@ if test "$vim_cv_uname_output" = Darwin; then
with_x=no with_x=no
fi fi
fi fi
dnl Avoid a bug with -O2 with gcc 4.0.1. Symptom: malloc() reports double
dnl free. This happens in expand_filename(), because the optimizer swaps
dnl two blocks of code, both using "repl", that can't be swapped.
if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-Oz/'`
fi
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1517,
/**/ /**/
1516, 1516,
/**/ /**/