github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-18 08:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SV 50300] Use CFLAGS value of "-O1" in POSIX mode.

Browse Source 
* read.c (record_files): Use "-O1" not "-O" for CFLAGS and FFLAGS.
* tests/scripts/targets/POSIX: Test for the new value.
This commit is contained in:
Paul Smith 2017-04-16 15:40:57 -04:00
parent fbf71ec25a
commit c4f30e6012
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
read.c
View File

@ -2055,22 +2055,24 @@ record_files (struct nameseq *filenames, const char *pattern,
/* Check for special targets. Do it here instead of, say, snap_deps() /* Check for special targets. Do it here instead of, say, snap_deps()
so that we can immediately use the value. */ so that we can immediately use the value. */
if (streq (name, ".POSIX")) if (!posix_pedantic && streq (name, ".POSIX"))
{ {
posix_pedantic = 1; posix_pedantic = 1;
define_variable_cname (".SHELLFLAGS", "-ec", o_default, 0); define_variable_cname (".SHELLFLAGS", "-ec", o_default, 0);
/* These default values are based on IEEE Std 1003.1-2008. */ /* These default values are based on IEEE Std 1003.1-2008.
It requires '-O 1' for [CF]FLAGS, but GCC doesn't allow space
between -O and the number so omit it here. */
define_variable_cname ("ARFLAGS", "-rv", o_default, 0); define_variable_cname ("ARFLAGS", "-rv", o_default, 0);
define_variable_cname ("CC", "c99", o_default, 0); define_variable_cname ("CC", "c99", o_default, 0);
define_variable_cname ("CFLAGS", "-O", o_default, 0); define_variable_cname ("CFLAGS", "-O1", o_default, 0);
define_variable_cname ("FC", "fort77", o_default, 0); define_variable_cname ("FC", "fort77", o_default, 0);
define_variable_cname ("FFLAGS", "-O 1", o_default, 0); define_variable_cname ("FFLAGS", "-O1", o_default, 0);
define_variable_cname ("SCCSGETFLAGS", "-s", o_default, 0); define_variable_cname ("SCCSGETFLAGS", "-s", o_default, 0);
} }
else if (streq (name, ".SECONDEXPANSION")) else if (!second_expansion && streq (name, ".SECONDEXPANSION"))
second_expansion = 1; second_expansion = 1;
#if !defined (__MSDOS__) && !defined (__EMX__) #if !defined (__MSDOS__) && !defined (__EMX__)
else if (streq (name, ".ONESHELL")) else if (!one_shell && streq (name, ".ONESHELL"))
one_shell = 1; one_shell = 1;
#endif #endif

4
tests/scripts/targets/POSIX
View File

@ -34,8 +34,8 @@ my %POSIX = (AR => 'ar', ARFLAGS => '-rv',
YACC => 'yacc', YFLAGS => '', YACC => 'yacc', YFLAGS => '',
LEX => 'lex', LFLAGS => '', LEX => 'lex', LFLAGS => '',
LDFLAGS => '', LDFLAGS => '',
CC => 'c99', CFLAGS => '-O', CC => 'c99', CFLAGS => '-O1',
FC => 'fort77', FFLAGS => '-O 1', FC => 'fort77', FFLAGS => '-O1',
SCCSFLAGS => '', SCCSGETFLAGS => '-s'); SCCSFLAGS => '', SCCSGETFLAGS => '-s');
my $make = join('', map { "\t\@echo '$_=\$($_)'\n" } sort keys %POSIX); my $make = join('', map { "\t\@echo '$_=\$($_)'\n" } sort keys %POSIX);
my $r = join('', map { "$_=$POSIX{$_}\n"} sort keys %POSIX); my $r = join('', map { "$_=$POSIX{$_}\n"} sort keys %POSIX);