Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove LLVM atomic hacks for Sparc.



details:   https://anonhg.NetBSD.org/src/rev/2d1885bd3895
branches:  trunk
changeset: 350423:2d1885bd3895
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jan 11 12:10:26 2017 +0000

description:
Remove LLVM atomic hacks for Sparc.

diffstat:

 external/bsd/libc++/lib/Makefile               |   6 +-----
 tests/lib/libc/sync/cpp_atomic_ops_linkable.cc |  16 ++--------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diffs (84 lines):

diff -r 16ad044eb4cd -r 2d1885bd3895 external/bsd/libc++/lib/Makefile
--- a/external/bsd/libc++/lib/Makefile  Wed Jan 11 12:08:34 2017 +0000
+++ b/external/bsd/libc++/lib/Makefile  Wed Jan 11 12:10:26 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2016/02/27 21:42:14 joerg Exp $
+#      $NetBSD: Makefile,v 1.10 2017/01/11 12:10:26 joerg Exp $
 
 LIB=           c++
 WARNS=         4
@@ -46,8 +46,4 @@
 
 LDFLAGS+=      -Wl,-z,defs
 
-.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
-CXXFLAGS+=     ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus  :}
-.endif
-
 .include <bsd.lib.mk>
diff -r 16ad044eb4cd -r 2d1885bd3895 tests/lib/libc/sync/cpp_atomic_ops_linkable.cc
--- a/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc    Wed Jan 11 12:08:34 2017 +0000
+++ b/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc    Wed Jan 11 12:10:26 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpp_atomic_ops_linkable.cc,v 1.4 2016/02/27 18:50:39 joerg Exp $ */
+/* $NetBSD: cpp_atomic_ops_linkable.cc,v 1.5 2017/01/11 12:10:26 joerg Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -58,19 +58,13 @@
   volatile std::atomic<T> m_val;
 };
 
-#if defined(__clang__) && defined(__sparc64__)
-#define NO_SHORT_ATOMICS
-#endif
-
 int main(int argc, char **argv)
 {
-#ifndef NO_SHORT_ATOMICS
   ATest<char>();
   ATest<signed char>();
   ATest<unsigned char>();
   ATest<short>();
   ATest<unsigned short>();
-#endif
   ATest<int>();
   ATest<unsigned int>();
   ATest<long>();
@@ -79,29 +73,23 @@
   ATest<long long>();
   ATest<unsigned long long>();
 #endif
-#ifndef NO_SHORT_ATOMICS
   ATest<char16_t>();
-#endif
   ATest<char32_t>();
   ATest<wchar_t>();
-#ifndef NO_SHORT_ATOMICS
   ATest<int_least8_t>();
   ATest<uint_least8_t>();
   ATest<int_least16_t>();
   ATest<uint_least16_t>();
-#endif
   ATest<int_least32_t>();
   ATest<uint_least32_t>();
 #ifdef __HAVE_ATOMIC64_OPS
   ATest<int_least64_t>();
   ATest<uint_least64_t>();
 #endif
-#ifndef NO_SHORT_ATOMICS
   ATest<int_fast8_t>();
   ATest<uint_fast8_t>();
   ATest<int_fast16_t>();
   ATest<uint_fast16_t>();
-#endif
   ATest<int_fast32_t>();
   ATest<uint_fast32_t>();
 #ifdef __HAVE_ATOMIC64_OPS
@@ -115,5 +103,5 @@
 #ifdef __HAVE_ATOMIC64_OPS
   ATest<intmax_t>();
   ATest<uintmax_t>();
-#endif /* NO_SHORT_ATOMICS */
+#endif
 }



Home | Main Index | Thread Index | Old Index