svn commit: r275776 - stable/10/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Sun Dec 14 18:28:01 2014
New Revision: 275776
URL: https://svnweb.freebsd.org/changeset/base/275776

Log:
  MFC 275564:
  
  Use the unified syntax when generating assembly for clang. The clang 3.5
  integrated assembler only accepts it.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  stable/10/sys/arm/arm/stdatomic.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/stdatomic.c
==============================================================================
--- stable/10/sys/arm/arm/stdatomic.c	Sun Dec 14 18:23:30 2014	(r275775)
+++ stable/10/sys/arm/arm/stdatomic.c	Sun Dec 14 18:28:01 2014	(r275776)
@@ -854,8 +854,13 @@ EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str
 EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_sub, "sub")		\
 EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_xor, "eor")
 
+#ifdef __clang__
+EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "strbeq")
+EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "strheq")
+#else
 EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "streqb")
 EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh")
+#endif
 EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq")
 
 #ifndef __clang__