[llvm-commits] [llvm-gcc-4.2] r67779 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c

[Bill Wendling]

Author: void
Date: Thu Mar 26 16:52:36 2009
New Revision: 67779

URL: http://llvm.org/viewvc/llvm-project?rev=67779&view=rev
Log:
--- Merging (from foreign repository) r67778 into '.':
U    gcc/libgcov.c

Put back change in 66069 that got lost due to gcc merge.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c?rev=67779&r1=67778&r2=67779&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/libgcov.c Thu Mar 26 16:52:36 2009
@@ -35,7 +35,7 @@
 #include "tm.h"
 
 /* APPLE LOCAL begin instant off 6414141 */
-#if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__)
+#if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__) && !defined(__arm__)
 #include <vproc.h>
 #if defined(VPROC_HAS_TRANSACTIONS)
 vproc_transaction_t vproc_transaction_begin(vproc_t virtual_proc) __attribute__((weak));
@@ -160,7 +160,7 @@
 }
 
 /* APPLE LOCAL begin instant off 6414141 */
-#if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__)
+#if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__) && !defined(__arm__)
 #if defined(VPROC_HAS_TRANSACTIONS)
 static vproc_transaction_t gcov_trans;
 #endif