replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ARM] Add hardware build attributes in assembler 

This passes an option to the ARM assembly parser to emit build
attributes for the hardware selected by command line options, when
assembling an assembly file.

This is not enabled for C/C++, as this would result in duplicate build
attribute directives being emitted in each inline assembly block, when
emitting assembly.

This also adds an option to allow disabling this behaviour for assembly
files, for users who were relying on the old behaviour.

Differential revision: https://reviews.llvm.org/D31813

llvm-svn: 300550
This commit is contained in:
Oliver Stannard 2017-04-18 13:21:05 +00:00
parent 233310f3e6
commit 692dc54b0d
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Driver/Options.td
View File

@ -1646,6 +1646,8 @@ def march_EQ : Joined<["-"], "march=">, Group<m_Group>;
def masm_EQ : Joined<["-"], "masm=">, Group<m_Group>, Flags<[DriverOption]>;
def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>;
def mimplicit_it_EQ : Joined<["-"], "mimplicit-it=">, Group<m_Group>;
def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Group<m_Group>;
def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group<m_Group>;
def mconstant_cfstrings : Flag<["-"], "mconstant-cfstrings">, Group<clang_ignored_m_Group>;
def mconsole : Joined<["-"], "mconsole">, Group<m_Group>, Flags<[DriverOption]>;
def mwindows : Joined<["-"], "mwindows">, Group<m_Group>, Flags<[DriverOption]>;

13
clang/lib/Driver/ToolChains/Clang.cpp
View File

@ -4996,6 +4996,19 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
case llvm::Triple::x86_64:
AddX86TargetArgs(Args, CmdArgs);
break;
case llvm::Triple::arm:
case llvm::Triple::armeb:
case llvm::Triple::thumb:
case llvm::Triple::thumbeb:
// This isn't in AddARMTargetArgs because we want to do this for assembly
// only, not C/C++.
if (Args.hasFlag(options::OPT_mdefault_build_attributes,
options::OPT_mno_default_build_attributes, true)) {
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-arm-add-build-attributes");
}
break;
}
// Consume all the warning flags. Usually this would be handled more

20
clang/test/Driver/arm-default-build-attributes.s Normal file
View File

@ -0,0 +1,20 @@
// Enabled by default for assembly
// RUN: %clang -target armv7--none-eabi -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-ENABLED
// Can be forced on or off for assembly.
// RUN: %clang -target armv7--none-eabi -### %s 2>&1 -mno-default-build-attributes \
// RUN: | FileCheck %s -check-prefix CHECK-DISABLED
// RUN: %clang -target armv7--none-eabi -### %s 2>&1 -mdefault-build-attributes \
// RUN: | FileCheck %s -check-prefix CHECK-ENABLED
// Option ignored C/C++ (since we always emit hardware and ABI build attributes
// during codegen).
// RUN: %clang -target armv7--none-eabi -### -x c %s -mdefault-build-attributes -verify 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-DISABLED
// RUN: %clang -target armv7--none-eabi -### -x c++ %s -mdefault-build-attributes -verify 2>&1 \
// RUN: | FileCheck %s -check-prefix CHECK-DISABLED
// CHECK-DISABLED-NOT: "-arm-add-build-attributes"
// CHECK-ENABLED: "-arm-add-build-attributes"
// expected-warning {{argument unused during compilation: '-mno-default-build-attributes'}}