[libcxxabi] r217341 - Use correct __ARM_ARCH macro

Renato Golin renato.golin at linaro.org
Sun Sep 7 11:39:44 PDT 2014


Author: rengolin
Date: Sun Sep  7 13:39:44 2014
New Revision: 217341

URL: http://llvm.org/viewvc/llvm-project?rev=217341&view=rev
Log:
Use correct __ARM_ARCH macro

Modified:
    libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S
    libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S

Modified: libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S?rev=217341&r1=217340&r2=217341&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S (original)
+++ libcxxabi/trunk/src/Unwind/UnwindRegistersRestore.S Sun Sep  7 13:39:44 2014
@@ -326,7 +326,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
   ldm lr, {r0-r12}
   ldr sp, [lr, #52]
   ldr lr, [lr, #60]  @ restore pc into lr
-#if _ARM_ARCH > 4
+#if __ARM_ARCH > 4
   bx lr
 #else
   mov pc, lr

Modified: libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S?rev=217341&r1=217340&r2=217341&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S (original)
+++ libcxxabi/trunk/src/Unwind/UnwindRegistersSave.S Sun Sep  7 13:39:44 2014
@@ -304,7 +304,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
   str lr, [r0, #56]
   str lr, [r0, #60]  @ store return address as pc
   mov r0, #0         @ return UNW_ESUCCESS
-#if _ARM_ARCH > 4
+#if __ARM_ARCH > 4
   bx lr
 #else
   mov pc, lr





More information about the cfe-commits mailing list