<div dir="ltr">hey Saleem - might be worth sending a cfe-dev email about what the general direction/goals are here (may not need precommit review for every patch, but just some sanity checking)<br><br><div class="gmail_quote"><div dir="ltr">On Mon, Jun 12, 2017 at 1:08 AM Daniel Jasper via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Mon Jun 12 03:08:18 2017<br>
New Revision: 305182<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=305182&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=305182&view=rev</a><br>
Log:<br>
Revert r305164/5/7.<br>
<br>
cc1as does not currently access the "--" version of this flag. At the<br>
very least this needs to be fixed and proper test cases need to be<br>
added.<br>
<br>
Simple reproducer:<br>
clang -Wa,--compress-debug-sections /tmp/test.cc<br>
<br>
Result:<br>
error: unknown argument: '--compress-debug-sections'<br>
<br>
Removed:<br>
cfe/trunk/test/Driver/compress-noias.c<br>
Modified:<br>
cfe/trunk/include/clang/Driver/CC1Options.td<br>
cfe/trunk/include/clang/Driver/Options.td<br>
cfe/trunk/lib/Driver/ToolChains/Clang.cpp<br>
cfe/trunk/lib/Driver/ToolChains/Gnu.cpp<br>
cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
cfe/trunk/test/Driver/compress.c<br>
cfe/trunk/test/Driver/nozlibcompress.c<br>
cfe/trunk/tools/driver/cc1as_main.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Driver/CC1Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/CC1Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver/CC1Options.td Mon Jun 12 03:08:18 2017<br>
@@ -134,6 +134,7 @@ def migrator_no_finalize_removal : Flag<<br>
//===----------------------------------------------------------------------===//<br>
<br>
let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {<br>
+<br>
def debug_info_kind_EQ : Joined<["-"], "debug-info-kind=">;<br>
def debug_info_macro : Flag<["-"], "debug-info-macro">,<br>
HelpText<"Emit macro debug information">;<br>
@@ -143,16 +144,14 @@ def fdebug_compilation_dir : Separate<["<br>
HelpText<"The compilation directory to embed in the debug info.">;<br>
def dwarf_debug_flags : Separate<["-"], "dwarf-debug-flags">,<br>
HelpText<"The string to embed in the Dwarf debug flags record.">;<br>
-def compress_debug_sections : Flag<["-"], "compress-debug-sections">,<br>
- HelpText<"DWARF debug sections compression">;<br>
-def compress_debug_sections_EQ : Flag<["-"], "compress-debug-sections=">,<br>
- HelpText<"DWARF debug sections compression type">;<br>
def mno_exec_stack : Flag<["-"], "mnoexecstack">,<br>
HelpText<"Mark the file as not needing an executable stack">;<br>
def massembler_fatal_warnings : Flag<["-"], "massembler-fatal-warnings">,<br>
HelpText<"Make assembler warnings fatal">;<br>
def mrelax_relocations : Flag<["--"], "mrelax-relocations">,<br>
HelpText<"Use relaxable elf relocations">;<br>
+def compress_debug_sections : Flag<["-"], "compress-debug-sections">,<br>
+ HelpText<"Compress DWARF debug sections using zlib">;<br>
def msave_temp_labels : Flag<["-"], "msave-temp-labels">,<br>
HelpText<"Save temporary labels in the symbol table. "<br>
"Note this may change .s semantics and shouldn't generally be used "<br>
<br>
Modified: cfe/trunk/include/clang/Driver/Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver/Options.td Mon Jun 12 03:08:18 2017<br>
@@ -1563,10 +1563,6 @@ def gdwarf_aranges : Flag<["-"], "gdwarf<br>
def gmodules : Flag <["-"], "gmodules">, Group<gN_Group>,<br>
HelpText<"Generate debug info with external references to clang modules"<br>
" or precompiled headers">;<br>
-def gz : Flag<["-"], "gz">, Group<g_flags_Group>,<br>
- HelpText<"DWARF debug sections compression type">;<br>
-def gz_EQ : Joined<["-"], "gz=">, Group<g_flags_Group>,<br>
- HelpText<"DWARF debug sections compression type">;<br>
def headerpad__max__install__names : Joined<["-"], "headerpad_max_install_names">;<br>
def help : Flag<["-", "--"], "help">, Flags<[CC1Option,CC1AsOption]>,<br>
HelpText<"Display available options">;<br>
<br>
Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)<br>
+++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Mon Jun 12 03:08:18 2017<br>
@@ -910,37 +910,6 @@ static void RenderDebugEnablingArgs(cons<br>
}<br>
}<br>
<br>
-static void RenderDebugInfoCompressionArgs(const ArgList &Args,<br>
- ArgStringList &CmdArgs,<br>
- const Driver &D) {<br>
- const Arg *A = Args.getLastArg(options::OPT_gz, options::OPT_gz_EQ);<br>
- if (!A)<br>
- return;<br>
-<br>
- if (A->getOption().getID() == options::OPT_gz) {<br>
- if (llvm::zlib::isAvailable())<br>
- CmdArgs.push_back("-compress-debug-sections");<br>
- else<br>
- D.Diag(diag::warn_debug_compression_unavailable);<br>
- return;<br>
- }<br>
-<br>
- StringRef Value = A->getValue();<br>
- if (Value == "none") {<br>
- CmdArgs.push_back("-compress-debug-sections=none");<br>
- } else if (Value == "zlib" || Value == "zlib-gnu") {<br>
- if (llvm::zlib::isAvailable()) {<br>
- CmdArgs.push_back(<br>
- Args.MakeArgString("-compress-debug-sections=" + Twine(Value)));<br>
- } else {<br>
- D.Diag(diag::warn_debug_compression_unavailable);<br>
- }<br>
- } else {<br>
- D.Diag(diag::err_drv_unsupported_option_argument)<br>
- << A->getOption().getName() << Value;<br>
- }<br>
-}<br>
-<br>
static const char *RelocationModelName(llvm::Reloc::Model Model) {<br>
switch (Model) {<br>
case llvm::Reloc::Static:<br>
@@ -1775,6 +1744,10 @@ static void CollectArgsForIntegratedAsse<br>
// arg after parsing the '-I' arg.<br>
bool TakeNextArg = false;<br>
<br>
+ // When using an integrated assembler, translate -Wa, and -Xassembler<br>
+ // options.<br>
+ bool CompressDebugSections = false;<br>
+<br>
bool UseRelaxRelocations = ENABLE_X86_RELAX_RELOCATIONS;<br>
const char *MipsTargetFeature = nullptr;<br>
for (const Arg *A :<br>
@@ -1849,11 +1822,12 @@ static void CollectArgsForIntegratedAsse<br>
CmdArgs.push_back("-massembler-fatal-warnings");<br>
} else if (Value == "--noexecstack") {<br>
CmdArgs.push_back("-mnoexecstack");<br>
- } else if (Value.startswith("-compress-debug-sections") ||<br>
- Value.startswith("--compress-debug-sections") ||<br>
- Value == "-nocompress-debug-sections" ||<br>
+ } else if (Value == "-compress-debug-sections" ||<br>
+ Value == "--compress-debug-sections") {<br>
+ CompressDebugSections = true;<br>
+ } else if (Value == "-nocompress-debug-sections" ||<br>
Value == "--nocompress-debug-sections") {<br>
- CmdArgs.push_back(Value.data());<br>
+ CompressDebugSections = false;<br>
} else if (Value == "-mrelax-relocations=yes" ||<br>
Value == "--mrelax-relocations=yes") {<br>
UseRelaxRelocations = true;<br>
@@ -1906,6 +1880,12 @@ static void CollectArgsForIntegratedAsse<br>
}<br>
}<br>
}<br>
+ if (CompressDebugSections) {<br>
+ if (llvm::zlib::isAvailable())<br>
+ CmdArgs.push_back("-compress-debug-sections");<br>
+ else<br>
+ D.Diag(diag::warn_debug_compression_unavailable);<br>
+ }<br>
if (UseRelaxRelocations)<br>
CmdArgs.push_back("--mrelax-relocations");<br>
if (MipsTargetFeature != nullptr) {<br>
@@ -2841,8 +2821,6 @@ void Clang::ConstructJob(Compilation &C,<br>
CmdArgs.push_back("-generate-type-units");<br>
}<br>
<br>
- RenderDebugInfoCompressionArgs(Args, CmdArgs, D);<br>
-<br>
bool UseSeparateSections = isUseSeparateSections(Triple);<br>
<br>
if (Args.hasFlag(options::OPT_ffunction_sections,<br>
@@ -4946,7 +4924,6 @@ void ClangAs::ConstructJob(Compilation &<br>
<br>
const llvm::Triple &Triple = getToolChain().getEffectiveTriple();<br>
const std::string &TripleStr = Triple.getTriple();<br>
- const auto &D = getToolChain().getDriver();<br>
<br>
// Don't warn about "clang -w -c foo.s"<br>
Args.ClaimAllArgs(options::OPT_w);<br>
@@ -5034,8 +5011,6 @@ void ClangAs::ConstructJob(Compilation &<br>
}<br>
RenderDebugEnablingArgs(Args, CmdArgs, DebugInfoKind, DwarfVersion,<br>
llvm::DebuggerKind::Default);<br>
- RenderDebugInfoCompressionArgs(Args, CmdArgs, D);<br>
-<br>
<br>
// Handle -fPIC et al -- the relocation-model affects the assembler<br>
// for some targets.<br>
<br>
Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original)<br>
+++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Mon Jun 12 03:08:18 2017<br>
@@ -650,8 +650,6 @@ void tools::gnutools::Assembler::Constru<br>
const InputInfoList &Inputs,<br>
const ArgList &Args,<br>
const char *LinkingOutput) const {<br>
- const auto &D = getToolChain().getDriver();<br>
-<br>
claimNoWarnArgs(Args);<br>
<br>
ArgStringList CmdArgs;<br>
@@ -662,23 +660,6 @@ void tools::gnutools::Assembler::Constru<br>
std::tie(RelocationModel, PICLevel, IsPIE) =<br>
ParsePICArgs(getToolChain(), Args);<br>
<br>
- if (const Arg *A = Args.getLastArg(options::OPT_gz, options::OPT_gz_EQ)) {<br>
- if (A->getOption().getID() == options::OPT_gz) {<br>
- CmdArgs.push_back("-compress-debug-sections");<br>
- } else {<br>
- StringRef Value = A->getValue();<br>
- if (Value == "none") {<br>
- CmdArgs.push_back("-compress-debug-sections=none");<br>
- } else if (Value == "zlib" || Value == "zlib-gnu") {<br>
- CmdArgs.push_back(<br>
- Args.MakeArgString("-compress-debug-sections=" + Twine(Value)));<br>
- } else {<br>
- D.Diag(diag::err_drv_unsupported_option_argument)<br>
- << A->getOption().getName() << Value;<br>
- }<br>
- }<br>
- }<br>
-<br>
switch (getToolChain().getArch()) {<br>
default:<br>
break;<br>
<br>
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Mon Jun 12 03:08:18 2017<br>
@@ -739,22 +739,9 @@ static bool ParseCodeGenArgs(CodeGenOpti<br>
Opts.InstrumentForProfiling = Args.hasArg(OPT_pg);<br>
Opts.CallFEntry = Args.hasArg(OPT_mfentry);<br>
Opts.EmitOpenCLArgMetadata = Args.hasArg(OPT_cl_kernel_arg_info);<br>
-<br>
- if (const Arg *A = Args.getLastArg(OPT_compress_debug_sections,<br>
- OPT_compress_debug_sections_EQ)) {<br>
- if (A->getOption().getID() == OPT_compress_debug_sections) {<br>
- // TODO: be more clever about the compression type auto-detection<br>
- Opts.setCompressDebugSections(llvm::DebugCompressionType::GNU);<br>
- } else {<br>
- auto DCT = llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue())<br>
- .Case("none", llvm::DebugCompressionType::None)<br>
- .Case("zlib", llvm::DebugCompressionType::Z)<br>
- .Case("zlib-gnu", llvm::DebugCompressionType::GNU)<br>
- .Default(llvm::DebugCompressionType::None);<br>
- Opts.setCompressDebugSections(DCT);<br>
- }<br>
- }<br>
-<br>
+ // TODO: map this from -gz in the driver and give it a named value<br>
+ if (Args.hasArg(OPT_compress_debug_sections))<br>
+ Opts.setCompressDebugSections(llvm::DebugCompressionType::GNU);<br>
Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations);<br>
Opts.DebugCompilationDir = Args.getLastArgValue(OPT_fdebug_compilation_dir);<br>
for (auto A : Args.filtered(OPT_mlink_bitcode_file, OPT_mlink_cuda_bitcode)) {<br>
<br>
Removed: cfe/trunk/test/Driver/compress-noias.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress-noias.c?rev=305181&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress-noias.c?rev=305181&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/compress-noias.c (original)<br>
+++ cfe/trunk/test/Driver/compress-noias.c (removed)<br>
@@ -1,37 +0,0 @@<br>
-// REQUIRES: zlib<br>
-// REQUIRES: x86-registered-target<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -Wa,-compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-_COMPRESS_DEBUG_SECTIONS %s<br>
-// CHECK-_COMPRESS_DEBUG_SECTIONS: "-compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-__COMPRESS_DEBUG_SECTIONS %s<br>
-// CHECK-__COMPRESS_DEBUG_SECTIONS: "--compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -Wa,--compress-debug-sections -Wa,--nocompress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-POSNEG %s<br>
-// CHECK-POSNEG: "--compress-debug-sections"<br>
-// CHECK-POSNEG: "--nocompress-debug-sections"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -Wa,-compress-debug-sections -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-MULTIPLE %s<br>
-// CHECK-MULTIPLE: "-compress-debug-sections"<br>
-// CHECK-MULTIPLE: "--compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s<br>
-// CHECK-OPT_GZ: "-compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=none -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=none -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s<br>
-// CHECK-OPT_GZ_EQ_NONE: "-compress-debug-sections=none"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=zlib -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=zlib -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s<br>
-// CHECK-OPT_GZ_EQ_ZLIB: "-compress-debug-sections=zlib"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=zlib-gnu -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=zlib-gnu -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s<br>
-// CHECK-OPT_GZ_EQ_ZLIB_GNU: "-compress-debug-sections=zlib-gnu"<br>
-<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=invalid -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s<br>
-// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz=invalid -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s<br>
-// CHECK-OPT_GZ_EQ_INVALID: error: unsupported argument 'invalid' to option 'gz='<br>
-<br>
<br>
Modified: cfe/trunk/test/Driver/compress.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress.c?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress.c?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/compress.c (original)<br>
+++ cfe/trunk/test/Driver/compress.c Mon Jun 12 03:08:18 2017<br>
@@ -1,36 +1,8 @@<br>
+// RUN: %clang -### -c -integrated-as -Wa,-compress-debug-sections %s 2>&1 | FileCheck --check-prefix=COMPRESS_DEBUG %s<br>
+// RUN: %clang -### -c -integrated-as -Wa,--compress-debug-sections %s 2>&1 | FileCheck --check-prefix=COMPRESS_DEBUG %s<br>
// REQUIRES: zlib<br>
<br>
-// RUN: %clang -### -fintegrated-as -Wa,-compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-_COMPRESS_DEBUG_SECTIONS %s<br>
-// CHECK-_COMPRESS_DEBUG_SECTIONS: "-compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-__COMPRESS_DEBUG_SECTIONS %s<br>
-// CHECK-__COMPRESS_DEBUG_SECTIONS: "--compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -Wa,--compress-debug-sections -Wa,--nocompress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-POSNEG %s<br>
-// CHECK-POSNEG: "--compress-debug-sections"<br>
-// CHECK-POSNEG: "--nocompress-debug-sections"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -Wa,-compress-debug-sections -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix CHECK-MULTIPLE %s<br>
-// CHECK-MULTIPLE: "-compress-debug-sections"<br>
-// CHECK-MULTIPLE: "--compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -gz -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s<br>
-// RUN: %clang -### -fintegrated-as -gz -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s<br>
-// CHECK-OPT_GZ: "-compress-debug-sections"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -gz=none -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s<br>
-// RUN: %clang -### -fintegrated-as -gz=none -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s<br>
-// CHECK-OPT_GZ_EQ_NONE: "-compress-debug-sections=none"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -gz=zlib -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s<br>
-// RUN: %clang -### -fintegrated-as -gz=zlib -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s<br>
-// CHECK-OPT_GZ_EQ_ZLIB: "-compress-debug-sections=zlib"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -gz=zlib-gnu -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s<br>
-// RUN: %clang -### -fintegrated-as -gz=zlib-gnu -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s<br>
-// CHECK-OPT_GZ_EQ_ZLIB_GNU: "-compress-debug-sections=zlib-gnu"<br>
-<br>
-// RUN: %clang -### -fintegrated-as -gz=invalid -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s<br>
-// RUN: %clang -### -fintegrated-as -gz=invalid -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s<br>
-// CHECK-OPT_GZ_EQ_INVALID: error: unsupported argument 'invalid' to option 'gz='<br>
+// COMPRESS_DEBUG: "-compress-debug-sections"<br>
<br>
+// RUN: %clang -### -c -integrated-as -Wa,--compress-debug-sections -Wa,--nocompress-debug-sections %s 2>&1 | FileCheck --check-prefix=NOCOMPRESS_DEBUG %s<br>
+// NOCOMPRESS_DEBUG-NOT: "-compress-debug-sections"<br>
<br>
Modified: cfe/trunk/test/Driver/nozlibcompress.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/nozlibcompress.c?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/nozlibcompress.c?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/nozlibcompress.c (original)<br>
+++ cfe/trunk/test/Driver/nozlibcompress.c Mon Jun 12 03:08:18 2017<br>
@@ -1,7 +1,6 @@<br>
+// RUN: %clang -c %s -Wa,--compress-debug-sections 2>&1 | FileCheck %s<br>
+// RUN: %clang -c %s -Wa,--compress-debug-sections -Wa,--nocompress-debug-sections 2>&1 | FileCheck --allow-empty --check-prefix=NOWARN %s<br>
// REQUIRES: nozlib<br>
<br>
-// RUN: %clang -fintegrated-as -gz -c %s 2>&1 | FileCheck %s -check-prefix CHECK-WARN<br>
-// RUN: %clang -fintegrated-as -gz=none -c %s 2>&1 | FileCheck -allow-empty -check-prefix CHECK-NOWARN %s<br>
-<br>
-// CHECK-WARN: warning: cannot compress debug sections (zlib not installed)<br>
-// CHECK-NOWARN-NOT: warning: cannot compress debug sections (zlib not installed)<br>
+// CHECK: warning: cannot compress debug sections (zlib not installed)<br>
+// NOWARN-NOT: warning: cannot compress debug sections (zlib not installed)<br>
<br>
Modified: cfe/trunk/tools/driver/cc1as_main.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=305182&r1=305181&r2=305182&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=305182&r1=305181&r2=305182&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/driver/cc1as_main.cpp (original)<br>
+++ cfe/trunk/tools/driver/cc1as_main.cpp Mon Jun 12 03:08:18 2017<br>
@@ -202,22 +202,9 @@ bool AssemblerInvocation::CreateFromArgs<br>
Opts.SaveTemporaryLabels = Args.hasArg(OPT_msave_temp_labels);<br>
// Any DebugInfoKind implies GenDwarfForAssembly.<br>
Opts.GenDwarfForAssembly = Args.hasArg(OPT_debug_info_kind_EQ);<br>
-<br>
- if (const Arg *A = Args.getLastArg(OPT_compress_debug_sections,<br>
- OPT_compress_debug_sections_EQ)) {<br>
- if (A->getOption().getID() == OPT_compress_debug_sections) {<br>
- // TODO: be more clever about the compression type auto-detection<br>
- Opts.CompressDebugSections = llvm::DebugCompressionType::GNU;<br>
- } else {<br>
- Opts.CompressDebugSections =<br>
- llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue())<br>
- .Case("none", llvm::DebugCompressionType::None)<br>
- .Case("zlib", llvm::DebugCompressionType::Z)<br>
- .Case("zlib-gnu", llvm::DebugCompressionType::GNU)<br>
- .Default(llvm::DebugCompressionType::None);<br>
- }<br>
- }<br>
-<br>
+ // TODO: base this on -gz instead<br>
+ if (Args.hasArg(OPT_compress_debug_sections))<br>
+ Opts.CompressDebugSections = llvm::DebugCompressionType::GNU;<br>
Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations);<br>
Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2, Diags);<br>
Opts.DwarfDebugFlags = Args.getLastArgValue(OPT_dwarf_debug_flags);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div>