Hi.
I've noticed that various files compile both these directives.
Do we want to merge them into dg-options?
Thanks,
Martin
gcc/gcc/testsuite/g++.old-deja/g++.robertl/eb27.C:
// { dg-options "-Wno-deprecated" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/pr94314.C:
/* { dg-options "-O2 -fdump-tree-cddce-details" } */
/* { dg-additional-options "-fdelete-null-pointer-checks" } */
gcc/gcc/testsuite/g++.dg/pr80481.C:
// { dg-options "-Ofast -funroll-loops -fopenmp -march=knl" }
// { dg-additional-options "--param vect-epilogues-nomask=0" }
gcc/gcc/testsuite/g++.dg/pr67989.C:
/* { dg-options "-std=c++11 -O2" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/pr81194.C:
// { dg-options "-O2 -fno-exceptions" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/pr94314-2.C:
/* { dg-options "-O2 -fdump-tree-cddce-details" } */
/* { dg-additional-options "-fdelete-null-pointer-checks" } */
gcc/gcc/testsuite/g++.dg/pr94314-3.C:
/* { dg-options "-O2 --param early-inlining-insns=100
-fdump-tree-cddce-details" } */
/* { dg-additional-options "-fdelete-null-pointer-checks" } */
gcc/gcc/testsuite/g++.dg/pr59510.C:
// { dg-options "-O2 -g --param=large-stack-frame-growth=1" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/pr57662.C:
/* { dg-options "-O2 -fselective-scheduling2 -fsel-sched-pipelining" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/tree-ssa/pr22444.C:
// { dg-options "-O2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/tree-ssa/pr27291.C:
/* { dg-options "-O2" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/tree-ssa/pr27283.C:
/* { dg-options "-O2" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/tree-ssa/pr27548.C:
// { dg-options "-O1" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/tree-ssa/copyprop.C:
// { dg-options "-Wno-error -fno-exceptions -fno-tree-vrp -O2 -fprofile-generate
-finline-limit=500 -std=c++98" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/tree-ssa/pr24351-3.C:
/* { dg-options "-O2" } */
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/tree-ssa/pr42337.C:
// { dg-options "-O2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/parse/error5.C:
// { dg-options "-fshow-column" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/ubsan/pr65583.C:
// { dg-options "-std=c++11 -fsanitize=undefined" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/opt/dump1.C:
// { dg-options "-O2 -fno-inline -fdump-final-insns" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/opt/pr82159-2.C:
// { dg-options "" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/opt/pr44919.C:
// { dg-options "-O3 -fselective-scheduling2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/opt/pr47615.C:
// { dg-options "-O -fstrict-aliasing -ftree-pre -fno-tree-fre -fno-tree-sra"
}
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/cpp1y/new1.C:
/* { dg-options "-O2 -fdump-tree-cddce-details" } */
// { dg-additional-options "-fdelete-null-pointer-checks" }
gcc/gcc/testsuite/g++.dg/cpp1y/new2.C:
/* { dg-options "-O2 -std=c++17 -fdump-tree-cddce-details" } */
/* { dg-additional-options "-fdelete-null-pointer-checks" } */
gcc/gcc/testsuite/g++.dg/tm/pr46646.C:
// { dg-options "-fgnu-tm -O0"}
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/tm/cgraph_edge.C:
// { dg-options "-fgnu-tm -O3" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/concepts/diagnostic1.C:
// { dg-options "-fconcepts" }
// { dg-additional-options "-fconcepts-diagnostics-depth=2" }
gcc/gcc/testsuite/g++.dg/other/pr52048.C:
// { dg-options "-fcompare-debug -fnon-call-exceptions -fno-tree-dominator-opts
-O2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/template/canon-type-8.C:
// { dg-options "" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/template/crash107.C:
// { dg-options "" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/template/show-template-tree-3.C:
// { dg-options "-fdiagnostics-show-template-tree" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/debug/dwarf2/pr61433.C:
// { dg-options "-O -fcompare-debug -fno-inline -fno-ipa-pure-const
-fipa-sra" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/init/new18.C:
// { dg-options "-O2 -fstrict-aliasing" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/ipa/pr78211.C:
// { dg-options "-fcompare-debug -fno-printf-return-value -flto
-fno-use-linker-plugin -O3" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/ipa/devirt-52.C:
// { dg-options "-O2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/ipa/pr63587-2.C:
// { dg-options "-O2" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/ipa/pr58371.C:
/* { dg-options "-O2" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/ipa/devirt-19.C:
/* { dg-options "-O2 -fdump-ipa-cp -fipa-cp-clone" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/ipa/pr44372.C:
/* { dg-options "-O -fipa-cp -fipa-cp-clone" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/20141013.C:
/* { dg-options "-fno-short-enums" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/pr54838.C:
// { dg-options "-ftracer -fno-tree-dce -fno-tree-sra" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/torture/pr34641.C:
// { dg-options "-fPIC" }
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/pr44148.C:
// { dg-options "-fpic" { target fpic } }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/torture/pr34850.C:
/* { dg-options "-ffat-lto-objects" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/pr40991.C:
/* { dg-options "-std=gnu++0x" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/pr36745.C:
/* { dg-options "-O2 -fPIC" } */
/* { dg-additional-options "-Wno-return-type" } */
gcc/gcc/testsuite/g++.dg/torture/pr58252.C:
// { dg-options "-fpermissive" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/torture/pr53752.C:
// { dg-options "-g" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/torture/pr48271.C:
// { dg-options "-ftree-vrp -fno-guess-branch-probability
-fnon-call-exceptions" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/g++.dg/torture/pr53602.C:
// { dg-options "-std=c++11" }
// { dg-additional-options "-Wno-return-type" }
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_1.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/avx512f-gather-2.c:
/* { dg-options "-O3 -mavx512f -fdump-tree-vect-details -mtune=knl" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_6.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/vect-pr67800.c:
/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details" } */
/* { dg-additional-options "-msse4.2" } */
gcc/gcc/testsuite/gcc.target/i386/avx512f-gather-5.c:
/* { dg-options "-O3 -mavx512f -mtune=knl" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/mask-unpack.c:
/* { dg-options "-mavx512bw -mavx512dq -mno-stackrealign -O3 -fopenmp-simd
-fdump-tree-vect-details" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/mask-pack.c:
/* { dg-options "-mavx512bw -O3 -fopenmp-simd -fdump-tree-vect-details" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_4.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_6.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_2.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_5.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_4.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_5.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_2.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_1.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_float_3.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/l_fma_double_3.c:
/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic
-mno-fma4" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/avx2-vect-mask-store-move1.c:
/* { dg-options "-O3 -mavx2 -fdump-tree-vect-details" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/i386/avx-vzeroupper-19.c:
/* { dg-options "-O3 -mavx -mtune=generic -dp" } */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
gcc/gcc/testsuite/gcc.target/arm/armv8_2-fp16-move-1.c:
/* { dg-options "-O2" } */
/* { dg-additional-options "-mfloat-abi=hard" } */
gcc/gcc/testsuite/gcc.target/arm/pr67989.C:
/* { dg-options "-std=c++11 -O2" } */
/* { dg-additional-options "-marm -Wno-return-type" } */
gcc/gcc/testsuite/gcc.target/arm/simd/vmmla_1.c:
/* { dg-options "-save-temps -O2" } */
/* { dg-additional-options "-march=armv8.2-a+i8mm" } */
gcc/gcc/testsuite/gcc.target/mips/cfgcleanup-jalr2.c:
/* { dg-options "-mabicalls -fpic -mno-mips16 -mno-micromips" } */
/* { dg-additional-options "-fno-inline -fipa-ra -mcompact-branches=never" }
*/
gcc/gcc/testsuite/gcc.target/mips/cfgcleanup-jalr3.c:
/* { dg-options "-mabicalls -fpic -mno-mips16 -mno-micromips" } */
/* { dg-additional-options "-fno-inline -fipa-ra -mcompact-branches=never" }
*/
gcc/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_dup.c:
/* { dg-options "-O2" } */
/* { dg-additional-options "-save-temps" } */
gcc/gcc/testsuite/c-c++-common/asan/pointer-compare-1.c:
/* { dg-options "-fsanitize=address,pointer-compare" } */
/* { dg-additional-options "-fno-section-anchors" } */
gcc/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-10.c:
/* { dg-options "-fsanitize=float-cast-overflow
-fsanitize-recover=float-cast-overflow" } */
/* { dg-additional-options "-DUSE_DFP -DBROKEN_DECIMAL_INT128" } */
gcc/gcc/testsuite/gcc.dg/builtin-bswap-7.c:
/* { dg-options "-O -fdump-rtl-combine" } */
/* { dg-additional-options "--param logical-op-non-short-circuit=0" } */
gcc/gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c:
/* { dg-options "-O2 -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre
-fno-tree-vrp" } */
/* { dg-additional-options "-fdump-tree-dse1-details" } */
gcc/gcc/testsuite/gcc.dg/graphite/pr85935.c:
/* { dg-options "-O -floop-parallelize-all -fno-tree-loop-im --param
scev-max-expr-size=3" } */
/* { dg-additional-options "--param graphite-allow-codegen-errors=1" } */
gcc/gcc/testsuite/gcc.dg/graphite/pr84204.c:
/* { dg-options "-O -floop-parallelize-all -fno-tree-loop-im --param
scev-max-expr-size=3" } */
/* { dg-additional-options "--param graphite-allow-codegen-errors=1" } */
