On 4/11/2016 2:15 PM, Garrett Cooper wrote:
> Author: ngie
> Date: Mon Apr 11 21:15:48 2016
> New Revision: 297836
> URL: https://svnweb.freebsd.org/changeset/base/297836
> 
> Log:
>   Fix appending -O0 to CFLAGS

This seems to be a NOP.

>   
>   The previous method would completely nerf CFLAGS once bsd.progs.mk had

I'm not seeing 'completely nerf' in a diff:
> -/usr/local/bin/ccache cc -O2 -pipe -DHAVE_FENV_H -D__HAVE_LONG_DOUBLE 
> -DLDBL_PREC=64   -O0 -g -std=iso9899:1999 -fstack-protector-strong 
> -Wno-unknown-pragmas   -fcolor-diagnostics -Qunused-arguments  -c 
> /root/git/freebsd/lib/msun/tests/nearbyint_test.c -o nearbyint_test.o
> -cc -O2 -pipe -DHAVE_FENV_H -D__HAVE_LONG_DOUBLE -DLDBL_PREC=64 -O0 -g 
> -std=iso9899:1999 -fstack-protector-strong -Wno-unknown-pragmas 
> -fcolor-diagnostics -Qunused-arguments  -o nearbyint_test.full 
> nearbyint_test.o   -lm
> +/usr/local/bin/ccache cc -O2 -pipe -DHAVE_FENV_H -D__HAVE_LONG_DOUBLE -O0 
> -DLDBL_PREC=64   -g -std=iso9899:1999 -fstack-protector-strong 
> -Wno-unknown-pragmas   -fcolor-diagnostics -Qunused-arguments  -c 
> /root/git/freebsd/lib/msun/tests/nearbyint_test.c -o nearbyint_test.o
> +cc -O2 -pipe -DHAVE_FENV_H -D__HAVE_LONG_DOUBLE -O0 -DLDBL_PREC=64 -g 
> -std=iso9899:1999 -fstack-protector-strong -Wno-unknown-pragmas 
> -fcolor-diagnostics -Qunused-arguments  -o nearbyint_test.full 
> nearbyint_test.o   -lm

It's simply moving it earlier, since it comes before the CFLAGS+=-DLDBL_PREC

I diff'd the entire output and all were the same as this.

Am I missing something?

>   recursed into the per-PROG logic and make the CFLAGS for tap testcases
>   to -O0, instead of appending to CFLAGS for all of the tap testcases.
>   
>   MFC after: 1 week
>   Sponsored by: EMC / Isilon Storage Division
> 
> Modified:
>   head/lib/msun/tests/Makefile
> 
> Modified: head/lib/msun/tests/Makefile
> ==============================================================================
> --- head/lib/msun/tests/Makefile      Mon Apr 11 21:12:24 2016        
> (r297835)
> +++ head/lib/msun/tests/Makefile      Mon Apr 11 21:15:48 2016        
> (r297836)
> @@ -62,9 +62,9 @@ TAP_TESTS_C+=       next_test
>  TAP_TESTS_C+=        rem_test
>  TAP_TESTS_C+=        trig_test
>  
> -.for t in ${TAP_TESTS_C}
> -CFLAGS.$t+=  -O0
> -.endfor
> +.if !empty(PROG) && !empty(TAP_TESTS_C:M${PROG})
> +CFLAGS+=     -O0
> +.endif
>  
>  CSTD=                c99
>  
> 


-- 
Regards,
Bryan Drewery

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to