<p dir="ltr">Lgtm thanks. </p>
<br><div class="gmail_quote"><div dir="ltr">On Mon, Jun 29, 2015, 10:35 PM Akira Hatanaka <<a href="mailto:ahatanak@gmail.com">ahatanak@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Remove cc1 option and simplify patch.<br>
<br>
<br>
<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D10831&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=d5Pm6exF2Ir_JCqGO1eFmNS1GbxVQ_6uNo6y4Woniqw&s=_UQ9ajx2BKbKL9m_-V9IXtKymYjDyMtwVdI5ZkLb6do&e=" rel="noreferrer" target="_blank">http://reviews.llvm.org/D10831</a><br>
<br>
Files:<br>
  lib/CodeGen/BackendUtil.cpp<br>
  lib/CodeGen/CGCall.cpp<br>
  test/CodeGen/fn-attr.c<br>
<br>
Index: lib/CodeGen/BackendUtil.cpp<br>
===================================================================<br>
--- lib/CodeGen/BackendUtil.cpp<br>
+++ lib/CodeGen/BackendUtil.cpp<br>
@@ -536,7 +536,6 @@<br>
   Options.NoZerosInBSS = CodeGenOpts.NoZeroInitializedInBSS;<br>
   Options.UnsafeFPMath = CodeGenOpts.UnsafeFPMath;<br>
   Options.StackAlignmentOverride = CodeGenOpts.StackAlignment;<br>
-  Options.TrapFuncName = CodeGenOpts.TrapFuncName;<br>
   Options.PositionIndependentExecutable = LangOpts.PIELevel != 0;<br>
   Options.FunctionSections = CodeGenOpts.FunctionSections;<br>
   Options.DataSections = CodeGenOpts.DataSections;<br>
Index: lib/CodeGen/CGCall.cpp<br>
===================================================================<br>
--- lib/CodeGen/CGCall.cpp<br>
+++ lib/CodeGen/CGCall.cpp<br>
@@ -1483,6 +1483,9 @@<br>
     if (!CodeGenOpts.StackRealignment)<br>
       FuncAttrs.addAttribute("no-realign-stack");<br>
<br>
+    if (!CodeGenOpts.TrapFuncName.empty())<br>
+      FuncAttrs.addAttribute("trap-func-name", CodeGenOpts.TrapFuncName);<br>
+<br>
     // Add target-cpu and target-features attributes to functions. If<br>
     // we have a decl for the function and it has a target attribute then<br>
     // parse that and add it to the feature set.<br>
Index: test/CodeGen/fn-attr.c<br>
===================================================================<br>
--- /dev/null<br>
+++ test/CodeGen/fn-attr.c<br>
@@ -0,0 +1,5 @@<br>
+// RUN: %clang_cc1 -triple thumbv7-apple-ios5 -function-attribute trap-func-name=trapfuncname1 -emit-llvm -o - %s | FileCheck %s<br>
+<br>
+// CHECK: attributes #0 = { {{.*}} "trap-func-name"="trapfuncname1"<br>
+<br>
+int foo1(int a) { return a; }<br>
<br>
EMAIL PREFERENCES<br>
  <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_settings_panel_emailpreferences_&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=d5Pm6exF2Ir_JCqGO1eFmNS1GbxVQ_6uNo6y4Woniqw&s=6bzfdpRABw0Z4AnSGPq2DZLkUOmonL8V-wjAlI7e3jc&e=" rel="noreferrer" target="_blank">http://reviews.llvm.org/settings/panel/emailpreferences/</a><br>
</blockquote></div>