[llvm-branch-commits] [llvm-gcc-branch] r102553 - in /llvm-gcc-4.2/branches/Apple/Morbo/gcc: c-common.c llvm-convert.cpp

[Dale Johannesen]

Author: johannes
Date: Wed Apr 28 18:06:06 2010
New Revision: 102553

URL: http://llvm.org/viewvc/llvm-project?rev=102553&view=rev
Log:
--- Merging r102536 into '.':
U    gcc/c-common.c
--- Merging r102543 into '.':
U    gcc/llvm-convert.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-common.c
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-common.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-common.c?rev=102553&r1=102552&r2=102553&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-common.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-common.c Wed Apr 28 18:06:06 2010
@@ -8090,6 +8090,8 @@
   sexpr = build_string (strlen (iasm_buffer), iasm_buffer);
 
   clobbers = uses;
+  /* LLVM LOCAL uses have been moved into clobbers. */
+  uses = NULL_TREE;
 #ifdef TARGET_MACHO
   if (iasm_memory_clobber (opcodename))
     {

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp?rev=102553&r1=102552&r2=102553&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp Wed Apr 28 18:06:06 2010
@@ -578,6 +578,10 @@
   if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (FnDecl)))
     Fn->addFnAttr(Attribute::AlwaysInline);
 
+  // asm functions are implicitly naked
+  if (DECL_IASM_ASM_FUNCTION (FnDecl) == 1)
+    Fn->addFnAttr(Attribute::Naked);
+
   // Pass inline keyword to optimizer.
   if (DECL_EXPLICIT_INLINE_P (FnDecl))
     Fn->addFnAttr(Attribute::InlineHint);