diff options
Diffstat (limited to 'compiler_wrapper')
69 files changed, 2813 insertions, 618 deletions
diff --git a/compiler_wrapper/README.md b/compiler_wrapper/README.md index bb63798a..e858038e 100644 --- a/compiler_wrapper/README.md +++ b/compiler_wrapper/README.md @@ -18,7 +18,7 @@ To test updates to the wrapper locally: Run `install_compiler_wrapper.sh` to install the new wrapper in the chroot: ``` -(chroot) ~/trunk/src/third_party/toolchain-utils/compiler_wrapper/install_compiler_wrapper.sh +(chroot) ~/chromiumos/src/third_party/toolchain-utils/compiler_wrapper/install_compiler_wrapper.sh ``` Then perform the tests, e.g. build with the new compiler. @@ -39,14 +39,14 @@ Rename chromiumos-overlay/sys-devel/llvm/llvm-${VERSION}.ebuild to the next revision number. For example, if the current version is 11.0_pre394483_p20200618-r2: ``` -(chroot) cd ~/trunk/src/third_party/chromiumos-overlay +(chroot) cd ~/chromiumos/src/third_party/chromiumos-overlay (chroot) git mv llvm-11.0_pre394483_p20200618-r2.ebuild llvm-11.0_pre394483_p20200618-r3.ebuild ``` Rename chromiumos-overlay/sys-devel/gcc/gcc-${VERSION}.ebuild to the next revision number. For example, if the current version is 10.2.0-r3: ``` -(chroot) cd ~/trunk/src/third_party/chromiumos-overlay +(chroot) cd ~/chromiumos/src/third_party/chromiumos-overlay (chroot) git mv sys-devel/gcc/gcc-10.2.0-r3.ebuild sys-devel/gcc/gcc-10.2.0-r4.ebuild ``` @@ -96,8 +96,9 @@ error-prone; compile commands may rely on env vars, they may be done within rely on intermediate state, etc. Because of the usefulness of these crash reports, our wrapper supports crashing -Clang even on files that ordinarily don't cause Clang to crash. For various -reasons (b/236736327), this support currently requires rebuilding and -redeploying the wrapper in order to work. That said, this could be a valuable -tool for devs interested in creating a self-contained reproducer without having -to manually reproduce the environment in which a particular build was performed. +Clang even on files that ordinarily don't cause Clang to crash. This requires +rebuilding and redeploying the wrapper (comments on b/236736327 explain why). +That said, this could be a valuable tool for devs interested in creating a +self-contained reproducer without having to manually reproduce the environment +in which a particular build was performed. See <crash_builds.go> +for instructions for how to use this functionality. diff --git a/compiler_wrapper/build.py b/compiler_wrapper/build.py index 930c2cfb..58822880 100755 --- a/compiler_wrapper/build.py +++ b/compiler_wrapper/build.py @@ -49,7 +49,7 @@ def parse_args(): return args -def calc_go_args(args, version, build_dir): +def calc_go_args(args, version, build_dir, output_file): # These seem unnecessary, and might lead to breakages with Go's ldflag # parsing. Don't allow them. if "'" in version: @@ -89,7 +89,7 @@ def calc_go_args(args, version, build_dir): "go", "build", "-o", - os.path.abspath(args.output_file), + output_file, "-ldflags", " ".join(ldFlags), ] + extra_args @@ -119,10 +119,23 @@ def main(): version += args.version_suffix # Note: Go does not support using absolute package names. # So we run go inside the directory of the the build file. - sys.exit( - subprocess.call(calc_go_args(args, version, build_dir), cwd=build_dir) + output_file = os.path.abspath(args.output_file) + subprocess.check_call( + calc_go_args(args, version, build_dir, output_file), cwd=build_dir ) + # b/203821449: we're occasionally seeing very small (and non-functional) + # compiler-wrapper binaries on SDK builds. To help narrow down why, add a + # size check here. Locally, the wrapper is 1.9MB, so warning on <1MB + # shouldn't flag false-positives. + size = os.path.getsize(output_file) + min_size_bytes = 1024 * 1024 + if size < min_size_bytes: + raise ValueError( + f"Compiler wrapper is {size:,} bytes; expected at " + f"least {min_size_bytes:,}" + ) + if __name__ == "__main__": main() diff --git a/compiler_wrapper/clang_flags.go b/compiler_wrapper/clang_flags.go index 1c45935e..a38e597a 100644 --- a/compiler_wrapper/clang_flags.go +++ b/compiler_wrapper/clang_flags.go @@ -36,18 +36,30 @@ func processClangFlags(builder *commandBuilder) error { clangDir = filepath.Dir(clangDir) } + var languageOverriden = false + for _, arg := range builder.args { + // Reading stdin with "-" requires either -E (which defaults to C) or -x + if arg.value == "-x" || arg.value == "-" { + languageOverriden = true + } + } + clangBasename := "clang" if strings.HasSuffix(builder.target.compiler, "++") { clangBasename = "clang++" + // If a package wants to specify the language then it can set the standard too. + if !languageOverriden { + builder.addPreUserArgs(builder.cfg.cppFlags...) + } } - // GCC flags to remove from the clang command line. - // TODO: Once clang supports GCC compatibility mode, remove - // these checks. - // + // Unsupported flags to remove from the clang command line. // Use of -Qunused-arguments allows this set to be small, just those // that clang still warns about. - unsupported := make(map[string]bool) + unsupported := map[string]bool{ + "-Xcompiler": true, + "-avoid-version": true, + } unsupportedPrefixes := []string{"-Wstrict-aliasing=", "-finline-limit="} diff --git a/compiler_wrapper/clang_flags_test.go b/compiler_wrapper/clang_flags_test.go index 08e8a8dc..8b3f5a24 100644 --- a/compiler_wrapper/clang_flags_test.go +++ b/compiler_wrapper/clang_flags_test.go @@ -33,6 +33,36 @@ func TestClangBasename(t *testing.T) { }) } +func TestAppendCppFlags(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + ctx.cfg.cppFlags = append(ctx.cfg.cppFlags, "cppOnlyFlag") + // C++ only flags are disabled on clang. + clangCmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand("./x86_64-cros-linux-gnu-clang", mainCc))) + if err := verifyArgCount(clangCmd, 0, "cppOnlyFlag"); err != nil { + t.Error(err) + } + // C++ only flags are enabled on clang++. + clangPlusPlusCmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand("./x86_64-cros-linux-gnu-clang++", mainCc))) + if err := verifyArgCount(clangPlusPlusCmd, 1, "cppOnlyFlag"); err != nil { + t.Error(err) + } + // C++ only flags are disabled with -x. + clangPlusPlusWithXCmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand("./x86_64-cros-linux-gnu-clang++", "-x", "c", mainCc))) + if err := verifyArgCount(clangPlusPlusWithXCmd, 0, "cppOnlyFlag"); err != nil { + t.Error(err) + } + // C++ only flags are disabled with " - " . + clangPlusPlusWithStdin := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand("./x86_64-cros-linux-gnu-clang++", "-", mainCc))) + if err := verifyArgCount(clangPlusPlusWithStdin, 0, "cppOnlyFlag"); err != nil { + t.Error(err) + } + }) +} + func TestClangPathGivenClangEnv(t *testing.T) { withTestContext(t, func(ctx *testContext) { ctx.env = []string{"CLANG=/a/b/clang"} @@ -310,3 +340,18 @@ func TestClangLinkerPathRelativeToRootDir(t *testing.T) { } }) } + +func TestFilterUnsupportedFlags(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(clangX86_64, "-Xcompiler", mainCc))) + if err := verifyArgCount(cmd, 0, "-Xcompiler"); err != nil { + t.Error(err) + } + cmd = ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(clangX86_64, "-avoid-version", mainCc))) + if err := verifyArgCount(cmd, 0, "-avoid-version"); err != nil { + t.Error(err) + } + }) +} diff --git a/compiler_wrapper/clang_tidy_flag.go b/compiler_wrapper/clang_tidy_flag.go index b19976d2..9722b39e 100644 --- a/compiler_wrapper/clang_tidy_flag.go +++ b/compiler_wrapper/clang_tidy_flag.go @@ -98,7 +98,8 @@ func calcClangTidyInvocation(env env, clangCmd *command, cSrcFile string, tidyFl }, nil } -func runClangTidyForTricium(env env, clangCmd *command, cSrcFile, fixesDir string, extraTidyFlags []string, crashArtifactsDir string) error { +func runClangTidyForTricium(env env, clangCmd *command, cSrcFile string, extraTidyFlags []string, crashArtifactsDir string) error { + fixesDir := filepath.Join(getCompilerArtifactsDir(env), "linting-output", "clang-tidy") if err := os.MkdirAll(fixesDir, 0777); err != nil { return fmt.Errorf("creating fixes directory at %q: %v", fixesDir, err) } @@ -230,12 +231,3 @@ func runClangTidy(env env, clangCmd *command, cSrcFile string, extraTidyFlags [] } return err } - -func hasAtLeastOneSuffix(s string, suffixes []string) bool { - for _, suffix := range suffixes { - if strings.HasSuffix(s, suffix) { - return true - } - } - return false -} diff --git a/compiler_wrapper/clang_tidy_flag_test.go b/compiler_wrapper/clang_tidy_flag_test.go index 73dec25f..b32d0d63 100644 --- a/compiler_wrapper/clang_tidy_flag_test.go +++ b/compiler_wrapper/clang_tidy_flag_test.go @@ -274,8 +274,9 @@ func TestPartiallyOmitGomaWithClangTidy(t *testing.T) { } func TestTriciumClangTidyIsProperlyDetectedFromEnv(t *testing.T) { - withClangTidyTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_TIDY=tricium"} + withClangTidyTriciumTestContext(t, func(ctx *testContext) { + artifactsBase := strings.Split(ctx.env[0], "=")[1] + outputDir := artifactsBase + "/linting-output/clang-tidy" ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error { switch ctx.cmdCount { case 1: @@ -292,8 +293,9 @@ func TestTriciumClangTidyIsProperlyDetectedFromEnv(t *testing.T) { for _, arg := range cmd.Args { if path := strings.TrimPrefix(arg, "--export-fixes="); path != arg { hasFixesFile = true - if !strings.HasPrefix(path, ctx.cfg.triciumNitsDir+"/") { - t.Errorf("fixes file was %q; expected it to be in %q", path, ctx.cfg.triciumNitsDir) + + if !strings.HasPrefix(path, outputDir) { + t.Errorf("fixes file was %q; expected it to be in %q", path, outputDir) } break } @@ -320,8 +322,7 @@ func TestTriciumClangTidyIsProperlyDetectedFromEnv(t *testing.T) { } func TestTriciumClangTidySkipsProtobufFiles(t *testing.T) { - withClangTidyTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_TIDY=tricium"} + withClangTidyTriciumTestContext(t, func(ctx *testContext) { cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(clangX86_64, mainCc+".pb.cc"))) if ctx.cmdCount != 1 { @@ -365,8 +366,7 @@ func testClangTidyFiltersClangTidySpecificFlagsWithPresetEnv(t *testing.T, ctx * } func TestClangTidyFiltersClangTidySpecificFlagsForTricium(t *testing.T) { - withClangTidyTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_TIDY=tricium"} + withClangTidyTriciumTestContext(t, func(ctx *testContext) { testClangTidyFiltersClangTidySpecificFlagsWithPresetEnv(t, ctx) }) } @@ -378,7 +378,7 @@ func TestClangTidyFiltersClangTidySpecificFlags(t *testing.T) { } func TestClangTidyFlagsAreFilteredFromGccInvocations(t *testing.T) { - withTestContext(t, func(ctx *testContext) { + withClangTidyTestContext(t, func(ctx *testContext) { cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc, "-clang-tidy-flag=--foo"))) if err := verifyArgCount(cmd, 0, ".*--foo.*"); err != nil { t.Error(err) @@ -387,8 +387,7 @@ func TestClangTidyFlagsAreFilteredFromGccInvocations(t *testing.T) { } func TestTriciumReportsClangTidyCrashesGracefully(t *testing.T) { - withClangTidyTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_TIDY=tricium"} + withClangTidyTriciumTestContext(t, func(ctx *testContext) { ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error { switch ctx.cmdCount { case 1: @@ -443,9 +442,24 @@ func TestTriciumReportsClangTidyCrashesGracefully(t *testing.T) { }) } -func withClangTidyTestContext(t *testing.T, work func(ctx *testContext)) { +func withClangTidyTestContextBaseDir(t *testing.T, work func(ctx *testContext)) { withTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_TIDY=1"} + artifactDir := t.TempDir() + ctx.env = []string{"CROS_ARTIFACTS_TMP_DIR=" + artifactDir} + work(ctx) + }) +} + +func withClangTidyTestContext(t *testing.T, work func(ctx *testContext)) { + withClangTidyTestContextBaseDir(t, func(ctx *testContext) { + ctx.env = append(ctx.env, "WITH_TIDY=1") + work(ctx) + }) +} + +func withClangTidyTriciumTestContext(t *testing.T, work func(ctx *testContext)) { + withClangTidyTestContextBaseDir(t, func(ctx *testContext) { + ctx.env = append(ctx.env, "WITH_TIDY=tricium") work(ctx) }) } diff --git a/compiler_wrapper/command.go b/compiler_wrapper/command.go index e2a5176d..d19c903a 100644 --- a/compiler_wrapper/command.go +++ b/compiler_wrapper/command.go @@ -93,7 +93,7 @@ func resolveAgainstPathEnv(env env, cmd string) (string, error) { return resolvedPath, nil } } - return "", fmt.Errorf("Couldn't find cmd %q in path", cmd) + return "", fmt.Errorf("couldn't find cmd %q in path", cmd) } func getAbsCmdPath(env env, cmd *command) string { diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go index dcaada99..bb144881 100644 --- a/compiler_wrapper/compiler_wrapper.go +++ b/compiler_wrapper/compiler_wrapper.go @@ -94,7 +94,7 @@ func runAndroidClangTidy(env env, cmd *command) error { if !errors.Is(err, context.DeadlineExceeded) { // When used time is over half of TIDY_TIMEOUT, give a warning. // These warnings allow users to fix slow jobs before they get worse. - usedSeconds := int(time.Now().Sub(startTime) / time.Second) + usedSeconds := int(time.Since(startTime) / time.Second) if usedSeconds > seconds/2 { warning := "%s:1:1: warning: clang-tidy used %d seconds.\n" fmt.Fprintf(env.stdout(), warning, getSourceFile(), usedSeconds) @@ -110,6 +110,7 @@ func runAndroidClangTidy(env env, cmd *command) error { } func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int, err error) { + if err := checkUnsupportedFlags(inputCmd); err != nil { return 0, err } @@ -150,7 +151,7 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int return 0, newErrorwithSourceLocf("unsupported compiler: %s", mainBuilder.target.compiler) } } else { - cSrcFile, tidyFlags, tidyMode := processClangTidyFlags(mainBuilder) + _, tidyFlags, tidyMode := processClangTidyFlags(mainBuilder) cSrcFile, iwyuFlags, iwyuMode := processIWYUFlags(mainBuilder) if mainBuilder.target.compilerType == clangType { err := prepareClangCommand(mainBuilder) @@ -159,14 +160,17 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int } if tidyMode != tidyModeNone { allowCCache = false + // Remove and ignore goma flags. + _, err := removeOneUserCmdlineFlagWithValue(mainBuilder, "--gomacc-path") + if err != nil && err != errNoSuchCmdlineArg { + return 0, err + } + clangCmdWithoutRemoteBuildAndCCache := mainBuilder.build() - var err error + switch tidyMode { case tidyModeTricium: - if cfg.triciumNitsDir == "" { - return 0, newErrorwithSourceLocf("tricium linting was requested, but no nits directory is configured") - } - err = runClangTidyForTricium(env, clangCmdWithoutRemoteBuildAndCCache, cSrcFile, cfg.triciumNitsDir, tidyFlags, cfg.crashArtifactsDir) + err = runClangTidyForTricium(env, clangCmdWithoutRemoteBuildAndCCache, cSrcFile, tidyFlags, cfg.crashArtifactsDir) case tidyModeAll: err = runClangTidy(env, clangCmdWithoutRemoteBuildAndCCache, cSrcFile, tidyFlags) default: @@ -180,7 +184,7 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int if iwyuMode != iwyuModeNone { if iwyuMode == iwyuModeError { - panic(fmt.Sprintf("Unknown IWYU mode")) + panic("Unknown IWYU mode") } allowCCache = false @@ -328,10 +332,26 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int } } +// TODO(b/288411201): Add -D_FORTIFY_SOURCE=2 to args if -D_FORITFY_SOURCE=3 is not present. +// This makes migrating to -D_FORTIFY_SOURCE=3 _way_ easier, since the wrapper's implicit +// -D_FORTIFY_SOURCE=2 can be ignored. +func addPreUserFortifyFlag(builder *commandBuilder) { + for _, arg := range builder.args { + if arg.value == "-D_FORTIFY_SOURCE=3" { + return + } + } + + builder.addPreUserArgs("-D_FORTIFY_SOURCE=2") +} + func prepareClangCommand(builder *commandBuilder) (err error) { if !builder.cfg.isHostWrapper { processSysrootFlag(builder) } + if builder.cfg.isHardened { + addPreUserFortifyFlag(builder) + } builder.addPreUserArgs(builder.cfg.clangFlags...) if builder.cfg.crashArtifactsDir != "" { builder.addPreUserArgs("-fcrash-diagnostics-dir=" + builder.cfg.crashArtifactsDir) @@ -357,6 +377,9 @@ func calcGccCommand(enableRusage bool, builder *commandBuilder) (bool, *command, if !builder.cfg.isHostWrapper { processSysrootFlag(builder) } + if builder.cfg.isHardened { + addPreUserFortifyFlag(builder) + } builder.addPreUserArgs(builder.cfg.gccFlags...) calcCommonPreUserArgs(builder) processGccFlags(builder) diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go index 6c3fcf52..bcf73d79 100644 --- a/compiler_wrapper/config.go +++ b/compiler_wrapper/config.go @@ -25,17 +25,18 @@ type config struct { // Flags to add to clang only, AFTER user flags (cannot be overridden // by the user). clangPostFlags []string + // Flags to be used only for C++ (not used to compile C code) + cppFlags []string // Toolchain root path relative to the wrapper binary. clangRootRelPath string gccRootRelPath string // Directory to store errors that were prevented with -Wno-error. newWarningsDir string - // Directory to store nits in when using `WITH_TIDY=tricium`. - triciumNitsDir string // Directory to store crash artifacts in. crashArtifactsDir string // Version. Only exposed via -print-config. - version string + version string + isHardened bool } // Version can be set via a linker flag. @@ -113,32 +114,47 @@ func crosCommonClangFlags() []string { "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", + } +} + +func crosCommonCppFlags() []string { + return []string{ + "-std=gnu++14", } } func crosCommonClangPostFlags() []string { // Temporarily disable Wdeprecated-copy. b/191479033 + // Temporarily disabled Wno-array-parameter. b/262076232 return []string{ + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", } } // Full hardening. // Temporarily disable function splitting because of chromium:434751. var crosHardenedConfig = config{ + isHardened: true, clangRootRelPath: "../..", gccRootRelPath: "../../../../..", // Pass "-fcommon" till the packages are fixed to work with new clang/gcc @@ -146,7 +162,6 @@ var crosHardenedConfig = config{ commonFlags: []string{ "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", }, gccFlags: []string{ @@ -165,11 +180,10 @@ var crosHardenedConfig = config{ "-fno-addrsig", "-fuse-ld=lld", "-ftrivial-auto-var-init=zero", - "-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang", ), clangPostFlags: crosCommonClangPostFlags(), - newWarningsDir: "/tmp/fatal_clang_warnings", - triciumNitsDir: "/tmp/linting_output/clang-tidy", + cppFlags: crosCommonCppFlags(), + newWarningsDir: "fatal_clang_warnings", crashArtifactsDir: "/tmp/clang_crash_diagnostics", } @@ -190,8 +204,8 @@ var crosNonHardenedConfig = config{ "-Wno-section", ), clangPostFlags: crosCommonClangPostFlags(), - newWarningsDir: "/tmp/fatal_clang_warnings", - triciumNitsDir: "/tmp/linting_output/clang-tidy", + cppFlags: crosCommonCppFlags(), + newWarningsDir: "fatal_clang_warnings", crashArtifactsDir: "/tmp/clang_crash_diagnostics", } @@ -220,8 +234,8 @@ var crosHostConfig = config{ ), // Temporarily disable Wdeprecated-copy. b/191479033 clangPostFlags: crosCommonClangPostFlags(), - newWarningsDir: "/tmp/fatal_clang_warnings", - triciumNitsDir: "/tmp/linting_output/clang-tidy", + cppFlags: crosCommonCppFlags(), + newWarningsDir: "fatal_clang_warnings", crashArtifactsDir: "/tmp/clang_crash_diagnostics", } @@ -234,7 +248,7 @@ var androidConfig = config{ gccFlags: []string{}, clangFlags: []string{}, clangPostFlags: []string{}, + cppFlags: []string{}, newWarningsDir: "", - triciumNitsDir: "", crashArtifactsDir: "", } diff --git a/compiler_wrapper/config_test.go b/compiler_wrapper/config_test.go index 0e6b44c5..47432856 100644 --- a/compiler_wrapper/config_test.go +++ b/compiler_wrapper/config_test.go @@ -118,12 +118,7 @@ func TestRealConfigWithConfigNameFlag(t *testing.T) { } func isSysrootHardened(cfg *config) bool { - for _, arg := range cfg.commonFlags { - if arg == "-D_FORTIFY_SOURCE=2" { - return true - } - } - return false + return cfg.isHardened } func resetGlobals() { diff --git a/compiler_wrapper/disable_werror_flag.go b/compiler_wrapper/disable_werror_flag.go index 17077671..91bc5845 100644 --- a/compiler_wrapper/disable_werror_flag.go +++ b/compiler_wrapper/disable_werror_flag.go @@ -18,6 +18,10 @@ import ( const numWErrorEstimate = 30 +func getForceDisableWerrorDir(env env, cfg *config) string { + return path.Join(getCompilerArtifactsDir(env), cfg.newWarningsDir) +} + func shouldForceDisableWerror(env env, cfg *config, ty compilerType) bool { if cfg.isAndroidWrapper { return cfg.useLlvmNext @@ -178,20 +182,21 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo oldMask := env.umask(0) defer env.umask(oldMask) + warningsDir := getForceDisableWerrorDir(env, cfg) // Allow root and regular users to write to this without issue. - if err := os.MkdirAll(cfg.newWarningsDir, 0777); err != nil { - return 0, wrapErrorwithSourceLocf(err, "error creating warnings directory %s", cfg.newWarningsDir) + if err := os.MkdirAll(warningsDir, 0777); err != nil { + return 0, wrapErrorwithSourceLocf(err, "error creating warnings directory %s", warningsDir) } // Have some tag to show that files aren't fully written. It would be sad if // an interrupted build (or out of disk space, or similar) caused tools to // have to be overly-defensive. - incompleteSuffix := ".incomplete" + const incompleteSuffix = ".incomplete" // Coming up with a consistent name for this is difficult (compiler command's // SHA can clash in the case of identically named files in different // directories, or similar); let's use a random one. - tmpFile, err := ioutil.TempFile(cfg.newWarningsDir, "warnings_report*.json"+incompleteSuffix) + tmpFile, err := ioutil.TempFile(warningsDir, "warnings_report*.json"+incompleteSuffix) if err != nil { return 0, wrapErrorwithSourceLocf(err, "error creating warnings file") } diff --git a/compiler_wrapper/disable_werror_flag_test.go b/compiler_wrapper/disable_werror_flag_test.go index d3be921d..9d3b4aba 100644 --- a/compiler_wrapper/disable_werror_flag_test.go +++ b/compiler_wrapper/disable_werror_flag_test.go @@ -11,6 +11,7 @@ import ( "io" "io/ioutil" "os" + "path" "path/filepath" "strings" "testing" @@ -320,13 +321,18 @@ func withForceDisableWErrorTestContext(t *testing.T, work func(ctx *testContext) withTestContext(t, func(ctx *testContext) { ctx.NoteTestWritesToUmask() - ctx.env = []string{"FORCE_DISABLE_WERROR=1"} + ctx.cfg.newWarningsDir = "new_warnings" + ctx.env = []string{ + "FORCE_DISABLE_WERROR=1", + artifactsTmpDirEnvName + "=" + path.Join(ctx.tempDir, "artifacts"), + } work(ctx) }) } func readLoggedWarnings(ctx *testContext) *warningsJSONData { - files, err := ioutil.ReadDir(ctx.cfg.newWarningsDir) + warningsDir := getForceDisableWerrorDir(ctx, ctx.cfg) + files, err := ioutil.ReadDir(warningsDir) if err != nil { if _, ok := err.(*os.PathError); ok { return nil @@ -336,7 +342,7 @@ func readLoggedWarnings(ctx *testContext) *warningsJSONData { if len(files) != 1 { ctx.t.Fatalf("expected 1 warning log file. Got: %s", files) } - data, err := ioutil.ReadFile(filepath.Join(ctx.cfg.newWarningsDir, files[0].Name())) + data, err := ioutil.ReadFile(filepath.Join(warningsDir, files[0].Name())) if err != nil { ctx.t.Fatal(err) } @@ -373,8 +379,9 @@ func TestDoubleBuildWerrorChmodsThingsAppropriately(t *testing.T) { t.Fatalf("expected 2 calls. Got: %d", ctx.cmdCount) } - t.Logf("Warnings dir is at %q", ctx.cfg.newWarningsDir) - warningsDir, err := os.Open(ctx.cfg.newWarningsDir) + warningsDirPath := getForceDisableWerrorDir(ctx, ctx.cfg) + t.Logf("Warnings dir is at %q", warningsDirPath) + warningsDir, err := os.Open(warningsDirPath) if err != nil { t.Fatalf("failed to open the new warnings dir: %v", err) } diff --git a/compiler_wrapper/env.go b/compiler_wrapper/env.go index 6b25d960..5ec8ea03 100644 --- a/compiler_wrapper/env.go +++ b/compiler_wrapper/env.go @@ -14,6 +14,8 @@ import ( "time" ) +const artifactsTmpDirEnvName = "CROS_ARTIFACTS_TMP_DIR" + type env interface { umask(int) int getenv(key string) (string, bool) @@ -121,7 +123,7 @@ func (env *commandRecordingEnv) exec(cmd *command) error { } func (env *commandRecordingEnv) runWithTimeout(cmd *command, duration time.Duration) error { - return env.runWithTimeout(cmd, duration) + return runCmdWithTimeout(env, cmd, duration) } func (env *commandRecordingEnv) run(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error { @@ -143,7 +145,7 @@ type printingEnv struct { env } -var _env = (*printingEnv)(nil) +var _ env = (*printingEnv)(nil) func (env *printingEnv) exec(cmd *command) error { printCmd(env, cmd) @@ -171,3 +173,14 @@ func printCmd(env env, cmd *command) { } io.WriteString(env.stderr(), "\n") } + +func getCompilerArtifactsDir(env env) string { + const defaultArtifactDir = "/tmp" + value, _ := env.getenv(artifactsTmpDirEnvName) + if value == "" { + fmt.Fprintf(env.stdout(), "$%s is not set, artifacts will be written to %s", artifactsTmpDirEnvName, defaultArtifactDir) + return defaultArtifactDir + } + return value + +} diff --git a/compiler_wrapper/env_test.go b/compiler_wrapper/env_test.go index 6b00a8b5..c10942de 100644 --- a/compiler_wrapper/env_test.go +++ b/compiler_wrapper/env_test.go @@ -226,6 +226,9 @@ func TestNewProcessEnvResolvesPwdAwayProperly(t *testing.T) { os.Unsetenv(envPwd) initialWd, err := os.Getwd() + if err != nil { + t.Fatalf("Failed getting working directory: %v", err) + } if initialWd == "/proc/self/cwd" { t.Fatalf("Working directory should never be %q when env is unset", initialWd) } diff --git a/compiler_wrapper/iwyu_flag.go b/compiler_wrapper/iwyu_flag.go index d13d114d..5788d8c7 100644 --- a/compiler_wrapper/iwyu_flag.go +++ b/compiler_wrapper/iwyu_flag.go @@ -8,14 +8,13 @@ import ( "bufio" "bytes" "fmt" + "os" "path/filepath" "strings" ) type useIWYUMode int -const iwyuCrashSubstring = "PLEASE submit a bug report" - const ( iwyuModeNone useIWYUMode = iota iwyuModeAll @@ -135,21 +134,24 @@ func runIWYU(env env, clangCmd *command, cSrcFile string, extraIWYUFlags []strin fmt.Fprintln(env.stderr(), "include-what-you-use failed") } - var path strings.Builder - path.WriteString(strings.TrimSuffix(iwyuCmd.Path, "include-what-you-use")) - path.WriteString("fix_includes.py") - fixIncludesCmd := &command{ - Path: path.String(), - Args: []string{"--nocomment"}, - EnvUpdates: clangCmd.EnvUpdates, + iwyuDir := filepath.Join(getCompilerArtifactsDir(env), "linting-output", "iwyu") + if err := os.MkdirAll(iwyuDir, 0777); err != nil { + return fmt.Errorf("creating fixes directory at %q: %v", iwyuDir, err) } - exitCode, err = wrapSubprocessErrorWithSourceLoc(fixIncludesCmd, - env.run(fixIncludesCmd, strings.NewReader(stderrMessage), env.stdout(), env.stderr())) - if err == nil && exitCode != 0 { - // Note: We continue on purpose when include-what-you-use fails - // to maintain compatibility with the previous wrapper. - fmt.Fprint(env.stderr(), "include-what-you-use failed") + f, err := os.CreateTemp(iwyuDir, "*.out") + if err != nil { + return fmt.Errorf("making output file for iwyu: %v", err) + } + writer := bufio.NewWriter(f) + if _, err := writer.WriteString(stderrMessage); err != nil { + return fmt.Errorf("writing output file for iwyu: %v", err) + } + if err := writer.Flush(); err != nil { + return fmt.Errorf("flushing output file buffer for iwyu: %v", err) + } + if err := f.Close(); err != nil { + return fmt.Errorf("finalizing output file for iwyu: %v", err) } return err diff --git a/compiler_wrapper/iwyu_flag_test.go b/compiler_wrapper/iwyu_flag_test.go index 76135944..e2db3b48 100644 --- a/compiler_wrapper/iwyu_flag_test.go +++ b/compiler_wrapper/iwyu_flag_test.go @@ -84,7 +84,7 @@ func TestUseIWYUBasedOnFileExtension(t *testing.T) { ctx.cmdCount = 0 ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(clangX86_64, tt.args...))) - if ctx.cmdCount > 1 && !tt.iwyu { + if ctx.cmdCount == 2 && !tt.iwyu { t.Errorf("expected a call to iwyu but got none for args %s", tt.args) } if ctx.cmdCount == 1 && tt.iwyu { @@ -129,7 +129,8 @@ func TestIWYUFiltersIWYUFlags(t *testing.T) { func withIWYUTestContext(t *testing.T, work func(ctx *testContext)) { withTestContext(t, func(ctx *testContext) { - ctx.env = []string{"WITH_IWYU=1"} + artifactDir := t.TempDir() + ctx.env = []string{"WITH_IWYU=1", "CROS_ARTIFACTS_TMP_DIR=" + artifactDir} work(ctx) }) } diff --git a/compiler_wrapper/main.go b/compiler_wrapper/main.go index 8cfa4364..7d1e3f49 100644 --- a/compiler_wrapper/main.go +++ b/compiler_wrapper/main.go @@ -3,22 +3,22 @@ // found in the LICENSE file. // This binary requires the following linker variables: -// - main.UseCCache: Whether to use ccache. -// - main.ConfigName: Name of the configuration to use. -// See config.go for the supported values. +// - main.UseCCache: Whether to use ccache. +// - main.ConfigName: Name of the configuration to use. +// See config.go for the supported values. // // The script ./build simplifies the call to `go build`. // E.g. ./build --use_ccache=true --config=cros.hardened will build a // binary that uses the ccache for ChromeOS with hardened flags. // // Test arguments: -// - updategolden: To update the golden results for the wrapper. Without it, -// the tests will verify that the wrapper output matches the goldens. -// - rungolden: To filter the golden tests by a regex for the wrapper env, path and args. +// - updategolden: To update the golden results for the wrapper. Without it, +// the tests will verify that the wrapper output matches the goldens. +// - rungolden: To filter the golden tests by a regex for the wrapper env, path and args. // // Examples: -// - run all tests in isolation: -// go test third_party/toolchain-utils/compiler_wrapper/ -v +// - run all tests in isolation: +// go test third_party/toolchain-utils/compiler_wrapper/ -v package main import ( diff --git a/compiler_wrapper/rusage_flag.go b/compiler_wrapper/rusage_flag.go index ed59b11e..899e4da8 100644 --- a/compiler_wrapper/rusage_flag.go +++ b/compiler_wrapper/rusage_flag.go @@ -62,7 +62,7 @@ func removeRusageFromCommand(compilerCmd *command) *command { } // maybeCaptureRusage captures rusage for execution of action() -// unless action returns an error or logFileName is "" +// unless action returns an error or logFileName is "" // a function is returned which saves the rusage log data at logFileName unless logFileName is "" // an error is returned if action returns an error, or rusage commands in syscall fails func maybeCaptureRusage(env env, compilerCmd *command, action func(willLogRusage bool) error) (maybeCommitToFile func(exitCode int) error, err error) { diff --git a/compiler_wrapper/sanitizer_flags.go b/compiler_wrapper/sanitizer_flags.go index 58312cc4..dd3529ed 100644 --- a/compiler_wrapper/sanitizer_flags.go +++ b/compiler_wrapper/sanitizer_flags.go @@ -47,6 +47,15 @@ func isInvasiveSanitizerFlag(flag string) bool { return false } +// Returns whether the flag given enables FORTIFY. Notably, this should return false if a flag +// disables FORTIFY. +func isFortifyEnableFlag(flag string) bool { + prefix := "-D_FORTIFY_SOURCE=" + // At the time of writing, -D_FORTIFY_SOURCE has the valid values 0, 1, 2, and 3. Seems + // unlikely to go past 9, so don't handle past 9. + return strings.HasPrefix(flag, prefix) && len(flag) == len(prefix)+1 && flag[len(prefix)] != '0' +} + func processSanitizerFlags(builder *commandBuilder) { hasSanitizeFlags := false // TODO: This doesn't take -fno-sanitize flags into account. This doesn't seem to be an @@ -64,18 +73,21 @@ func processSanitizerFlags(builder *commandBuilder) { // Flags not supported by sanitizers (ASan etc.) unsupportedSanitizerFlags := map[string]bool{ - "-D_FORTIFY_SOURCE=1": true, - "-D_FORTIFY_SOURCE=2": true, - "-Wl,--no-undefined": true, - "-Wl,-z,defs": true, + "-Wl,--no-undefined": true, + "-Wl,-z,defs": true, } builder.transformArgs(func(arg builderArg) string { // TODO: This is a bug in the old wrapper to not filter // non user args for gcc. Fix this once we don't compare to the old wrapper anymore. - if (builder.target.compilerType != gccType || arg.fromUser) && - unsupportedSanitizerFlags[arg.value] { - return "" + linkerDefinedFlag := ",-z,defs" + if builder.target.compilerType != gccType || arg.fromUser { + if unsupportedSanitizerFlags[arg.value] || isFortifyEnableFlag(arg.value) { + return "" + } + if strings.Contains(arg.value, linkerDefinedFlag) { + return strings.ReplaceAll(arg.value, linkerDefinedFlag, "") + } } return arg.value }) diff --git a/compiler_wrapper/sanitizer_flags_test.go b/compiler_wrapper/sanitizer_flags_test.go index b4b1fd83..c81d95c0 100644 --- a/compiler_wrapper/sanitizer_flags_test.go +++ b/compiler_wrapper/sanitizer_flags_test.go @@ -45,6 +45,12 @@ func TestFilterUnsupportedSanitizerFlagsIfSanitizeGiven(t *testing.T) { } cmd = ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(gccX86_64, "-fsanitize=kernel-address", "-Wl,-z,defs,relro", mainCc))) + if err := verifyArgCount(cmd, 1, "-Wl,relro"); err != nil { + t.Error(err) + } + + cmd = ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, "-fsanitize=kernel-address", "-Wl,-z -Wl,defs", mainCc))) if err := verifyArgCount(cmd, 0, "-Wl,-z"); err != nil { t.Error(err) @@ -67,6 +73,42 @@ func TestFilterUnsupportedSanitizerFlagsIfSanitizeGiven(t *testing.T) { }) } +func TestAllFortifyEnableFlagsAreRemoved(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + flagsToRemove := []string{ + "-D_FORTIFY_SOURCE=1", + "-D_FORTIFY_SOURCE=2", + "-D_FORTIFY_SOURCE=3", + } + for _, fortifyFlag := range flagsToRemove { + ctx.cfg.commonFlags = []string{fortifyFlag} + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(clangX86_64, "-fsanitize=kernel-address", mainCc))) + if err := verifyArgCount(cmd, 0, fortifyFlag); err != nil { + t.Errorf("Verifying FORTIFY flag %q is removed: %v", fortifyFlag, err) + } + } + }) +} + +func TestFortifyDisableFlagsAreKept(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + flagsToKeep := []string{ + "-D_FORTIFY_SOURCE", + "-D_FORTIFY_SOURCE=", + "-D_FORTIFY_SOURCE=0", + } + for _, fortifyFlag := range flagsToKeep { + ctx.cfg.commonFlags = []string{fortifyFlag} + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(clangX86_64, "-fsanitize=kernel-address", mainCc))) + if err := verifyArgCount(cmd, 1, fortifyFlag); err != nil { + t.Errorf("Verifying FORTIFY flag %q is kept: %v", fortifyFlag, err) + } + } + }) +} + func TestFilterUnsupportedDefaultSanitizerFlagsIfSanitizeGivenForClang(t *testing.T) { withTestContext(t, func(ctx *testContext) { ctx.cfg.commonFlags = []string{"-D_FORTIFY_SOURCE=1"} diff --git a/compiler_wrapper/sysroot_flag.go b/compiler_wrapper/sysroot_flag.go index 597153a9..0256abcd 100644 --- a/compiler_wrapper/sysroot_flag.go +++ b/compiler_wrapper/sysroot_flag.go @@ -9,19 +9,37 @@ import ( "strings" ) +const skipSysrootAutodetectionFlag = "--cros-skip-wrapper-sysroot-autodetection" + func processSysrootFlag(builder *commandBuilder) { + hadSkipSysrootMagicFlag := false fromUser := false userSysroot := "" - for _, arg := range builder.args { - if arg.fromUser && strings.HasPrefix(arg.value, "--sysroot=") { + builder.transformArgs(func(arg builderArg) string { + switch { + // In rare cases (e.g., glibc), we want all sysroot autodetection logic to be + // disabled. This flag can be passed to disable that. + case arg.value == skipSysrootAutodetectionFlag: + hadSkipSysrootMagicFlag = true + return "" + + case arg.fromUser && strings.HasPrefix(arg.value, "--sysroot="): fromUser = true sysrootArg := strings.Split(arg.value, "=") if len(sysrootArg) == 2 { userSysroot = sysrootArg[1] } - break + return arg.value + + default: + return arg.value } + }) + + if hadSkipSysrootMagicFlag { + return } + sysroot, syrootPresent := builder.env.getenv("SYSROOT") if syrootPresent { builder.updateEnv("SYSROOT=") diff --git a/compiler_wrapper/sysroot_flag_test.go b/compiler_wrapper/sysroot_flag_test.go index 9fea6848..bca8d1b0 100644 --- a/compiler_wrapper/sysroot_flag_test.go +++ b/compiler_wrapper/sysroot_flag_test.go @@ -6,9 +6,35 @@ package main import ( "path" + "regexp" "testing" ) +func TestOmitSysrootGivenSysrootSuppressionFlag(t *testing.T) { + escapedAutodetectionFlag := regexp.QuoteMeta(skipSysrootAutodetectionFlag) + withTestContext(t, func(ctx *testContext) { + runWithCompiler := func(compiler string) { + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(compiler, skipSysrootAutodetectionFlag, mainCc))) + if err := verifyArgOrder(cmd, mainCc); err != nil { + t.Error(err) + } + if err := verifyArgCount(cmd, 0, "--sysroot.*"); err != nil { + t.Error(err) + } + if err := verifyArgCount(cmd, 0, "-L.*"); err != nil { + t.Error(err) + } + if err := verifyArgCount(cmd, 0, escapedAutodetectionFlag); err != nil { + t.Error(err) + } + } + + runWithCompiler(gccX86_64) + runWithCompiler(clangX86_64) + }) +} + func TestOmitSysrootGivenUserDefinedSysroot(t *testing.T) { withTestContext(t, func(ctx *testContext) { runWithCompiler := func(compiler string) { diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index 6993499c..9c9dac03 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -27,26 +27,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -84,26 +91,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -144,26 +158,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json index 26654033..281239a5 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json @@ -18,26 +18,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -62,26 +69,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -106,26 +120,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -150,26 +171,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -194,26 +222,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -238,26 +273,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -282,26 +324,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -326,26 +375,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -370,26 +426,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json index b151051c..045b6438 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json @@ -17,26 +17,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json index 396bb95c..7f4b1c9e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json @@ -17,26 +17,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -60,26 +67,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -103,26 +117,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -146,26 +167,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -189,26 +217,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -232,26 +267,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -275,26 +317,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -318,26 +367,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -361,26 +417,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json index f32a7045..a965ca7f 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json @@ -17,26 +17,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -63,26 +70,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stdout": "somemessage", @@ -109,26 +123,34 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", + "-std=gnu++14", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -155,26 +177,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -208,15 +237,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -225,11 +259,13 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -266,15 +302,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -283,11 +324,13 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -324,15 +367,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -341,11 +389,13 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stdout": "somemessage", @@ -372,26 +422,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -415,26 +472,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -458,26 +522,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -501,26 +572,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -547,26 +625,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json index 8df51096..76f3f14b 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json @@ -19,15 +19,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -35,11 +40,13 @@ "-fcommon", "-fsanitize=kernel-address", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -65,15 +72,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -81,11 +93,13 @@ "-fcommon", "-fsanitize=kernel-address", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -111,15 +125,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -127,11 +146,13 @@ "-fcommon", "-fsanitize=kernel-address", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -157,15 +178,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -173,11 +199,13 @@ "-fcommon", "-fsanitize=kernel-address", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -202,15 +230,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -218,11 +251,13 @@ "-fcommon", "-fsanitize=fuzzer", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -248,15 +283,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -265,11 +305,13 @@ "-fsanitize=address", "-fprofile-instr-generate", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -294,15 +336,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -310,11 +357,13 @@ "-fcommon", "-fsanitize=address", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -339,15 +388,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -355,11 +409,13 @@ "-fcommon", "-fprofile-instr-generate", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json index 7c296af9..493a3dc2 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json @@ -27,15 +27,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -50,11 +55,13 @@ "-Woverride-init", "-Wunsafe-loop-optimizations", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -79,15 +86,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -95,11 +107,13 @@ "-fcommon", "-Wno-#warnings", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -124,15 +138,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -140,11 +159,13 @@ "-fcommon", "-Wno-error=uninitialized", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -169,15 +190,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", @@ -185,11 +211,13 @@ "-fcommon", "-someflag", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json index c1cf0507..e425e074 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json @@ -33,26 +33,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } }, @@ -63,26 +70,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -123,26 +137,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } }, @@ -153,26 +174,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -215,26 +243,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stdout": "somemessage", @@ -248,26 +283,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -311,26 +353,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } }, @@ -341,26 +390,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json index ad290b45..0fb8e1f2 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json @@ -20,26 +20,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] } } @@ -56,7 +63,8 @@ "args": [ "main.cc" ] - } + }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" }, "cmds": [ { @@ -66,26 +74,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stderr": "-Werror originalerror", @@ -98,26 +113,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-Wno-error", "-Wno-error=poison-system-directories" ] @@ -148,26 +170,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", - "-Wno-string-concatenation" + "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions" ] }, "stderr": "-Werror originalerror", @@ -180,26 +209,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-unused-local-typedefs", "-fno-addrsig", "-fuse-ld=lld", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "main.cc", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-Wno-error", "-Wno-error=poison-system-directories" ] diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index 8bd823ed..b4cdd8d2 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -26,36 +26,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -99,36 +107,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -175,36 +191,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json index 56f78efa..83d7a8df 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json @@ -17,37 +17,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -80,37 +88,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -143,37 +159,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -206,37 +230,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -268,37 +300,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -330,37 +370,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -392,37 +440,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -454,37 +510,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -516,37 +580,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "-ftrapv", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-win-gnu" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json index db2f59aa..d072960a 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json @@ -16,36 +16,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -77,36 +85,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -138,36 +154,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -199,36 +223,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -259,36 +291,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -319,36 +359,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -379,36 +427,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -439,36 +495,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -499,36 +563,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv8m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-win-gnu" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json index 186a16ed..fc120977 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json @@ -16,36 +16,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -80,36 +88,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -144,36 +160,45 @@ "args": [ "../../usr/bin/clang++", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", + "-std=gnu++14", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -208,36 +233,44 @@ "args": [ "somepath/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -279,26 +312,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -306,11 +345,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -355,26 +396,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -382,11 +429,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -426,26 +475,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -453,11 +508,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -492,36 +549,44 @@ "args": [ "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -553,36 +618,44 @@ "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -614,36 +687,44 @@ "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -675,36 +756,44 @@ "args": [ "../usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", @@ -739,36 +828,44 @@ "args": [ "/tmp/usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json index 6a38e845..0c9376cd 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json @@ -21,19 +21,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -43,11 +49,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -84,19 +92,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -106,11 +120,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -147,19 +163,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -169,11 +191,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -210,19 +234,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -232,11 +262,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -272,19 +304,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -294,11 +332,13 @@ "-fsanitize=fuzzer", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -335,19 +375,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -358,11 +404,13 @@ "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -398,19 +446,25 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", @@ -420,11 +474,13 @@ "-fsanitize=address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -457,37 +513,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json index ec91216d..d7f73998 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json @@ -26,26 +26,32 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -59,11 +65,13 @@ "-Wunsafe-loop-optimizations", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -96,37 +104,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-#warnings", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -159,37 +175,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-error=uninitialized", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -222,37 +246,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-someflag", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json index 0ad97b7a..537fc89c 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json @@ -16,12 +16,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -52,36 +52,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -116,36 +124,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -173,37 +189,45 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-nopie", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -236,25 +260,31 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fno-stack-protector", @@ -262,11 +292,13 @@ "-D__KERNEL__", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -299,25 +331,31 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/armv7a-cros-linux-gnueabihf", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "-fno-stack-protector", @@ -325,11 +363,13 @@ "-D__KERNEL__", "main.cc", "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7a-cros-linux-gnueabihf" @@ -360,37 +400,45 @@ "path": "/usr/bin/ccache", "args": [ "../../usr/bin/clang", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "--sysroot=xyz", "main.cc", "-Lxyz/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json index f7438940..5d88fec8 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json @@ -31,36 +31,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -73,36 +81,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -145,36 +161,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -188,36 +212,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -262,36 +294,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -308,36 +348,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -383,36 +431,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -426,36 +482,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json index 9cd72611..3d1e305e 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json @@ -19,36 +19,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -74,7 +82,8 @@ "args": [ "main.cc" ] - } + }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" }, "cmds": [ { @@ -83,36 +92,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -133,36 +150,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -201,36 +226,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -251,36 +284,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json index d9b532f0..9d17797a 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json @@ -16,36 +16,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -61,12 +69,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -102,36 +110,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -147,12 +163,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -183,36 +199,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -247,36 +271,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -292,12 +324,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json index 63b7da18..86745dc6 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json @@ -16,12 +16,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -53,12 +53,12 @@ "args": [ "./x86_64-cros-eabi-gcc.real", "--sysroot=/usr/x86_64-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -90,12 +90,12 @@ "args": [ "./x86_64-cros-win-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -127,12 +127,12 @@ "args": [ "./armv7m-cros-linux-gnu-gcc.real", "--sysroot=/usr/armv7m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "main.cc", @@ -163,12 +163,12 @@ "args": [ "./armv7m-cros-eabi-gcc.real", "--sysroot=/usr/armv7m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -199,12 +199,12 @@ "args": [ "./armv7m-cros-win-gnu-gcc.real", "--sysroot=/usr/armv7m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "main.cc", @@ -235,12 +235,12 @@ "args": [ "./armv8m-cros-linux-gnu-gcc.real", "--sysroot=/usr/armv8m-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "main.cc", @@ -271,12 +271,12 @@ "args": [ "./armv8m-cros-eabi-gcc.real", "--sysroot=/usr/armv8m-cros-eabi", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -307,12 +307,12 @@ "args": [ "./armv8m-cros-win-gnu-gcc.real", "--sysroot=/usr/armv8m-cros-win-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json index 6e06ce18..b6f3d1d9 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json @@ -16,12 +16,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -56,12 +56,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -96,12 +96,12 @@ "args": [ "/tmp/stable/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -133,12 +133,12 @@ "args": [ "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -170,12 +170,12 @@ "args": [ "./symlinked/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -210,12 +210,12 @@ "args": [ "/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json index 9aaf9c25..0552bf7c 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json @@ -18,12 +18,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=kernel-address", @@ -58,12 +58,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=kernel-address", @@ -98,12 +98,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=kernel-address", @@ -138,12 +138,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=kernel-address", @@ -177,12 +177,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=fuzzer", @@ -217,12 +217,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=address", @@ -257,12 +257,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fsanitize=address", @@ -296,12 +296,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fprofile-instr-generate", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json index 4ee90cbc..52c9f2cc 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json @@ -17,12 +17,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-march=goldmont", @@ -56,12 +56,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-march=goldmont-plus", @@ -95,12 +95,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-march=skylake", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json index 9397333d..8b28e6e2 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json @@ -16,12 +16,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -52,12 +52,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -92,12 +92,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -126,12 +126,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-nopie", @@ -165,11 +165,11 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "-fno-stack-protector", @@ -204,11 +204,11 @@ "args": [ "./armv7a-cros-linux-gnueabihf-gcc.real", "--sysroot=/usr/armv7a-cros-linux-gnueabihf", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", - "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", "-fno-stack-protector", @@ -241,12 +241,12 @@ "path": "/usr/bin/ccache", "args": [ "./x86_64-cros-linux-gnu-gcc.real", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--sysroot=xyz", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 8bd823ed..b4cdd8d2 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -26,36 +26,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -99,36 +107,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -175,36 +191,44 @@ "/usr/bin/ccache", "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json index 186a16ed..fc120977 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -16,36 +16,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -80,36 +88,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -144,36 +160,45 @@ "args": [ "../../usr/bin/clang++", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", + "-std=gnu++14", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -208,36 +233,44 @@ "args": [ "somepath/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -279,26 +312,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -306,11 +345,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -355,26 +396,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -382,11 +429,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -426,26 +475,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -453,11 +508,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -492,36 +549,44 @@ "args": [ "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -553,36 +618,44 @@ "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -614,36 +687,44 @@ "args": [ "a/b/c/d/e/usr/bin/clang", "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -675,36 +756,44 @@ "args": [ "../usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", @@ -739,36 +828,44 @@ "args": [ "/tmp/usr/bin/clang", "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index f7438940..5d88fec8 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -31,36 +31,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -73,36 +81,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -145,36 +161,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -188,36 +212,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -262,36 +294,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -308,36 +348,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -383,36 +431,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -426,36 +482,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json index 9cd72611..3d1e305e 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json @@ -19,36 +19,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -74,7 +82,8 @@ "args": [ "main.cc" ] - } + }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" }, "cmds": [ { @@ -83,36 +92,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -133,36 +150,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -201,36 +226,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -251,36 +284,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json index d9b532f0..9d17797a 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json @@ -16,36 +16,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -61,12 +69,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -102,36 +110,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -147,12 +163,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -183,36 +199,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -247,36 +271,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -292,12 +324,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json index 6e06ce18..b6f3d1d9 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json @@ -16,12 +16,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -56,12 +56,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -96,12 +96,12 @@ "args": [ "/tmp/stable/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -133,12 +133,12 @@ "args": [ "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -170,12 +170,12 @@ "args": [ "./symlinked/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -210,12 +210,12 @@ "args": [ "/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index da522b99..b476031b 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -25,36 +25,44 @@ "/tmp/sysroot_bisect", "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -94,36 +102,44 @@ "someBisectDir", "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -166,36 +182,44 @@ "someBisectDir", "/usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json index 287833cf..3849ecf8 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json @@ -15,36 +15,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -73,36 +81,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -131,36 +147,45 @@ "path": "../../usr/bin/clang++", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", + "-std=gnu++14", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -189,36 +214,44 @@ "path": "somepath/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -254,26 +287,32 @@ "path": "/somedir/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -281,11 +320,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -325,26 +366,32 @@ "args": [ "/somedir/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -352,11 +399,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -395,26 +444,32 @@ "path": "/somedir/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", @@ -422,11 +477,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -455,36 +512,44 @@ "path": "/usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -510,36 +575,44 @@ "path": "a/b/c/d/e/usr/bin/clang", "args": [ "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -565,36 +638,44 @@ "path": "a/b/c/d/e/usr/bin/clang", "args": [ "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -620,36 +701,44 @@ "path": "../usr/bin/clang", "args": [ "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", @@ -678,36 +767,44 @@ "path": "/tmp/usr/bin/clang", "args": [ "--sysroot=/tmp/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json index f7438940..5d88fec8 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json @@ -31,36 +31,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -73,36 +81,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -145,36 +161,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -188,36 +212,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -262,36 +294,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -308,36 +348,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -383,36 +431,44 @@ "--", "-resource-dir=someResourceDir", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -426,36 +482,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json index 54943fb3..a4b2d2b4 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json @@ -18,36 +18,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -68,7 +76,8 @@ "args": [ "main.cc" ] - } + }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" }, "cmds": [ { @@ -76,36 +85,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -120,36 +137,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -182,36 +207,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -226,36 +259,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json index 1704cd17..091e00f5 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json @@ -16,36 +16,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -60,12 +68,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -97,36 +105,44 @@ "args": [ "../../usr/bin/clang", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -142,12 +158,12 @@ "args": [ "./x86_64-cros-linux-gnu-gcc.real", "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -178,36 +194,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -242,36 +266,44 @@ "path": "../../usr/bin/clang", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "--unwindlib=libunwind", "-Wno-section", "-fno-addrsig", "-fuse-ld=lld", + "-ftrivial-auto-var-init=zero", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -286,12 +318,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json index fb877370..ed60e6d6 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json @@ -15,12 +15,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -50,12 +50,12 @@ "path": "./x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -85,12 +85,12 @@ "path": "/tmp/stable/x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -117,12 +117,12 @@ "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -149,12 +149,12 @@ "path": "./symlinked/x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", @@ -184,12 +184,12 @@ "path": "/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real", "args": [ "--sysroot=/usr/x86_64-cros-linux-gnu", + "-D_FORTIFY_SOURCE=2", "-fno-reorder-blocks-and-partition", "-Wno-unused-local-typedefs", "-Wno-maybe-uninitialized", "-fcommon", "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index 96fd88cf..9a71937a 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -29,26 +29,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -95,26 +102,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -164,26 +178,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json index 35f90b1e..aa9dfa80 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json @@ -20,15 +20,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -36,11 +41,13 @@ "-ftrapv", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -76,15 +83,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -92,11 +104,13 @@ "-ftrapv", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -132,15 +146,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -148,11 +167,13 @@ "-ftrapv", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -188,15 +209,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -205,11 +231,13 @@ "-ftrapv", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -244,15 +272,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -260,11 +293,13 @@ "-ftrapv", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -299,15 +334,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -316,11 +356,13 @@ "-ftrapv", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -355,15 +397,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -372,11 +419,13 @@ "-ftrapv", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -411,15 +460,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -427,11 +481,13 @@ "-ftrapv", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -466,15 +522,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -483,11 +544,13 @@ "-ftrapv", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-win-gnu" diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json index e2479e9b..778e7a0b 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json @@ -19,26 +19,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -73,26 +80,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "main.cc", "-L/usr/x86_64-cros-eabi/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -127,26 +141,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "main.cc", "-L/usr/x86_64-cros-win-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -181,15 +202,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -197,11 +223,13 @@ "--prefix=../../bin/armv7m-cros-linux-gnu-", "main.cc", "-L/usr/armv7m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-linux-gnu" @@ -235,26 +263,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "main.cc", "-L/usr/armv7m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-eabi" @@ -288,15 +323,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -304,11 +344,13 @@ "--prefix=../../bin/armv7m-cros-win-gnu-", "main.cc", "-L/usr/armv7m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7m-cros-win-gnu" @@ -342,15 +384,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -358,11 +405,13 @@ "--prefix=../../bin/armv8m-cros-linux-gnu-", "main.cc", "-L/usr/armv8m-cros-linux-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-linux-gnu" @@ -396,26 +445,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "main.cc", "-L/usr/armv8m-cros-eabi/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-eabi" @@ -449,15 +505,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -465,11 +526,13 @@ "--prefix=../../bin/armv8m-cros-win-gnu-", "main.cc", "-L/usr/armv8m-cros-win-gnu/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv8m-cros-win-gnu" diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json index 11c566b6..b9ff8405 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json @@ -19,26 +19,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -76,26 +83,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -133,26 +147,34 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", + "-std=gnu++14", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -190,26 +212,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -254,15 +283,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -271,11 +305,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -323,15 +359,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -340,11 +381,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -387,15 +430,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -404,11 +452,13 @@ "--gcc-toolchain=/usr", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -446,26 +496,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -500,26 +557,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -554,26 +618,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-Ba/b/c/d/e/bin", "-target", @@ -608,26 +679,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", @@ -665,26 +743,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json index fe0df74d..27404a12 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json @@ -21,15 +21,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -37,11 +42,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -78,15 +85,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -94,11 +106,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -135,15 +149,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -151,11 +170,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -192,15 +213,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -208,11 +234,13 @@ "-fsanitize=kernel-address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -248,15 +276,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -264,11 +297,13 @@ "-fsanitize=fuzzer", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -305,15 +340,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -322,11 +362,13 @@ "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -362,15 +404,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -378,11 +425,13 @@ "-fsanitize=address", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -418,15 +467,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -434,11 +488,13 @@ "-fprofile-instr-generate", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json index b744e8c6..03d90589 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json @@ -29,15 +29,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -52,11 +57,13 @@ "-Wunsafe-loop-optimizations", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -92,15 +99,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -108,11 +120,13 @@ "-Wno-#warnings", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -148,15 +162,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -164,11 +183,13 @@ "-Wno-error=uninitialized", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -204,15 +225,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -220,11 +246,13 @@ "-someflag", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json index ed3a6ef1..3ceaa3f7 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json @@ -52,26 +52,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -109,26 +116,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -159,15 +173,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -175,11 +194,13 @@ "-nopie", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -215,15 +236,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -232,11 +258,13 @@ "-D__KERNEL__", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -272,15 +300,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -290,11 +323,13 @@ "-D__KERNEL__", "main.cc", "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-B../../bin", "-target", "armv7a-cros-linux-gnueabihf" @@ -328,15 +363,20 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", @@ -344,11 +384,13 @@ "--sysroot=xyz", "main.cc", "-Lxyz/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json index 830abee6..b8575a09 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json @@ -34,26 +34,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -69,26 +76,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -134,26 +148,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -170,26 +191,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -237,26 +265,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -276,26 +311,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -344,26 +386,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -380,26 +429,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json index 07c20900..ff37898f 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json @@ -22,26 +22,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -67,7 +74,8 @@ "args": [ "main.cc" ] - } + }, + "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp" }, "cmds": [ { @@ -79,26 +87,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -122,26 +137,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -183,26 +205,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -226,26 +255,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json index 9dd5687b..771b224a 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json @@ -19,26 +19,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -95,26 +102,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -166,26 +180,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", @@ -223,26 +244,33 @@ "-Qunused-arguments", "-Werror=poison-system-directories", "-Wno-compound-token-split-by-macro", + "-Wno-deprecated-builtins", "-Wno-deprecated-declarations", + "-Wno-enum-constexpr-conversion", "-Wno-error=implicit-function-declaration", "-Wno-error=implicit-int", "-Wno-final-dtor-non-final-class", + "-Wno-single-bit-bitfield-constant-conversion", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-fdebug-default-version=5", - "-fexperimental-new-pass-manager", + "-Wno-int-conversion", + "-Wno-incompatible-function-pointer-types", + "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES", "-Wno-section", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-L/usr/x86_64-cros-linux-gnu/usr/lib64", + "-Wno-array-parameter", "-Wno-compound-token-split-by-space", "-Wno-deprecated-copy", "-Wno-unused-but-set-variable", "-Wno-implicit-int-float-conversion", "-Wno-string-concatenation", + "-Wno-gnu-offsetof-extensions", "-mno-movbe", "-B../../bin", "-target", diff --git a/compiler_wrapper/testutil_test.go b/compiler_wrapper/testutil_test.go index 463e34ac..8bac479b 100644 --- a/compiler_wrapper/testutil_test.go +++ b/compiler_wrapper/testutil_test.go @@ -39,7 +39,6 @@ type testContext struct { tempDir string env []string cfg *config - inputCmd *command lastCmd *command cmdCount int cmdMock func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error @@ -192,8 +191,11 @@ func (ctx *testContext) mustFail(exitCode int) string { func (ctx *testContext) updateConfig(cfg *config) { *ctx.cfg = *cfg ctx.cfg.newWarningsDir = filepath.Join(ctx.tempDir, "fatal_clang_warnings") - ctx.cfg.triciumNitsDir = filepath.Join(ctx.tempDir, "tricium_nits") ctx.cfg.crashArtifactsDir = filepath.Join(ctx.tempDir, "clang_crash_diagnostics") + + // Ensure this is always empty, so any test that depends on it will see no output unless + // it's properly set up. + ctx.cfg.newWarningsDir = "" } func (ctx *testContext) newCommand(path string, args ...string) *command { |