diff options
Diffstat (limited to 'compiler_wrapper/testdata/cros_clang_host_golden')
9 files changed, 258 insertions, 454 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index 1c2e5a0e..28adfee2 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -18,30 +18,27 @@ "cmd": { "path": "/usr/bin/env", "args": [ - "python3", + "python", "-c", - "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", + "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", "someBisectStage", "/tmp/sysroot_bisect", "/tmp/stable/clang", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -70,30 +67,27 @@ "cmd": { "path": "/usr/bin/env", "args": [ - "python3", + "python", "-c", - "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", + "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", "someBisectStage", "someBisectDir", "/tmp/stable/clang", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -125,30 +119,27 @@ "cmd": { "path": "/usr/bin/env", "args": [ - "python3", + "python", "-c", - "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", + "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n", "someBisectStage", "someBisectDir", "/tmp/stable/clang", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ], "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 ec57b0d7..b52f0c85 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 @@ -16,23 +16,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -55,23 +52,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -94,23 +88,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -133,23 +124,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -172,23 +160,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -211,23 +196,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -250,23 +232,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -289,23 +268,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -328,23 +304,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } 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 99c12725..251694e8 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 @@ -15,23 +15,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } 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 9389a4d8..e5a8afa7 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 @@ -15,23 +15,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -53,23 +50,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -91,23 +85,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -129,23 +120,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -167,23 +155,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -205,23 +190,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -243,23 +225,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -281,23 +260,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -319,23 +295,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } 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 080f1d48..cb175e05 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json @@ -15,23 +15,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -56,23 +53,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "stdout": "somemessage", @@ -97,23 +91,20 @@ "path": "/tmp/stable/clang++", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -138,23 +129,20 @@ "path": "somepath/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -186,25 +174,22 @@ "path": "/somedir/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -239,25 +224,22 @@ "path": "/somedir/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -292,25 +274,22 @@ "path": "/somedir/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "stdout": "somemessage", @@ -335,23 +314,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -373,23 +349,20 @@ "path": "/tmp/stable/a/b/c/d/e/f/g/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -411,23 +384,20 @@ "path": "/tmp/stable/a/b/c/d/e/f/g/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -449,23 +419,20 @@ "path": "/tmp/stable/somedir/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -490,23 +457,20 @@ "path": "/tmp/stable/pathenv/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } 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 0aeb2362..3df459fa 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 @@ -17,24 +17,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -58,24 +55,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -99,24 +93,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -140,24 +131,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -180,25 +168,22 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fno-experimental-new-pass-manager", "-fsanitize=fuzzer", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -222,26 +207,23 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fno-experimental-new-pass-manager", "-fsanitize=address", "-fprofile-instr-generate", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -264,24 +246,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=address", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -304,24 +283,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fprofile-instr-generate", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } 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 bddb110e..40427b96 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 @@ -26,31 +26,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", - "-mno-movbe", - "-Wclobbered", - "-Wno-psabi", - "-Wlogical-op", - "-Wmissing-parameter-type", - "-Wold-style-declaration", - "-Woverride-init", - "-Wunsafe-loop-optimizations", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -73,24 +62,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-#warnings", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -113,24 +99,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-error=uninitialized", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -153,24 +136,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-error=unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -193,24 +173,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -233,24 +210,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wunused-variable", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -273,24 +247,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-someflag", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json index 89e4c6f3..eebda022 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json @@ -26,28 +26,25 @@ "cmd": { "path": "/tmp/stable/clang-tidy", "args": [ - "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", + "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", "--", "-resource-dir=someResourceDir", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } }, @@ -56,23 +53,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -106,28 +100,25 @@ "cmd": { "path": "/tmp/stable/clang-tidy", "args": [ - "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", + "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", "--", "-resource-dir=someResourceDir", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } }, @@ -136,23 +127,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -188,28 +176,25 @@ "cmd": { "path": "/tmp/stable/clang-tidy", "args": [ - "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", + "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", "--", "-resource-dir=someResourceDir", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "stdout": "somemessage", @@ -221,23 +206,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -274,28 +256,25 @@ "cmd": { "path": "/tmp/stable/clang-tidy", "args": [ - "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", + "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*", "main.cc", "--", "-resource-dir=someResourceDir", "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } }, @@ -304,23 +283,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "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 75f5e474..248fcb4b 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 @@ -18,23 +18,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] } } @@ -59,23 +56,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "stderr": "-Werror originalerror", @@ -86,25 +80,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation", - "-Wno-error", - "-Wno-error=poison-system-directories" + "-Wno-error" ] } } @@ -131,23 +121,20 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation" + "-Wno-implicit-int-float-conversion" ] }, "stderr": "-Werror originalerror", @@ -158,25 +145,21 @@ "path": "/tmp/stable/clang", "args": [ "-Qunused-arguments", + "-grecord-gcc-switches", "-fno-addrsig", - "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", + "-Wno-return-stack-address", "-Werror=poison-system-directories", "-Wno-unknown-warning-option", - "-fexperimental-new-pass-manager", - "-Wno-compound-token-split-by-macro", - "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", "-Wno-implicit-int-float-conversion", - "-Wno-compound-token-split-by-space", - "-Wno-string-concatenation", - "-Wno-error", - "-Wno-error=poison-system-directories" + "-Wno-error" ] }, "stdout": "somemessage", |