Index: include/clang/Driver/Options.td =================================================================== --- include/clang/Driver/Options.td +++ include/clang/Driver/Options.td @@ -1629,6 +1629,8 @@ def masm_EQ : Joined<["-"], "masm=">, Group, Flags<[DriverOption]>; def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group; def mimplicit_it_EQ : Joined<["-"], "mimplicit-it=">, Group; +def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Group; +def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group; def mconstant_cfstrings : Flag<["-"], "mconstant-cfstrings">, Group; def mconsole : Joined<["-"], "mconsole">, Group, Flags<[DriverOption]>; def mwindows : Joined<["-"], "mwindows">, Group, Flags<[DriverOption]>; Index: lib/Driver/ToolChains/Clang.cpp =================================================================== --- lib/Driver/ToolChains/Clang.cpp +++ lib/Driver/ToolChains/Clang.cpp @@ -4996,6 +4996,19 @@ 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 Index: test/Driver/arm-default-build-attributes.s =================================================================== --- /dev/null +++ test/Driver/arm-default-build-attributes.s @@ -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'}}