[libcxx] r299606 - Use alternate string layout for ARMv7k

[Mehdi Amini via cfe-commits]

Author: mehdi_amini
Date: Wed Apr  5 20:10:22 2017
New Revision: 299606

URL: http://llvm.org/viewvc/llvm-project?rev=299606&view=rev
Log:
Use alternate string layout for ARMv7k

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=299606&r1=299605&r2=299606&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Wed Apr  5 20:10:22 2017
@@ -265,7 +265,7 @@
 // _LIBCPP_ALTERNATE_STRING_LAYOUT is an old name for
 // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT left here for backward compatibility.
 #if (defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) &&       \
-     !defined(__arm__)) ||                                                     \
+     (!defined(__arm__) || __ARM_ARCH_7K__ >= 2)) ||                           \
     defined(_LIBCPP_ALTERNATE_STRING_LAYOUT)
 #define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
 #endif