From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 11 Feb 2015 05:20:44 +0000 (+0000)
Subject: unwind: clean up straggling -Wundef warning
X-Git-Tag: llvmorg-3.7.0-rc1~12475
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ebbcd968bc07017d72286b6f03f9f58e2c77a83;p=platform%2Fupstream%2Fllvm.git

unwind: clean up straggling -Wundef warning

Conservatively define __ARM_ARCH to 4 in the case that it is undefined (e.g.
with GCC).

llvm-svn: 228806
---

diff --git a/libcxxabi/src/Unwind/assembly.h b/libcxxabi/src/Unwind/assembly.h
index b749d67..f46a24d 100644
--- a/libcxxabi/src/Unwind/assembly.h
+++ b/libcxxabi/src/Unwind/assembly.h
@@ -62,6 +62,10 @@
   SYMBOL_NAME(name):
 
 #if defined(__arm__)
+#if !defined(__ARM_ARCH)
+#define __ARM_ARCH 4
+#endif
+
 #if defined(__ARM_ARCH_4T__) || __ARM_ARCH >= 5
 #define ARM_HAS_BX
 #endif