Module Name: src
Committed By: joerg
Date: Wed Jan 11 12:10:26 UTC 2017
Modified Files:
src/external/bsd/libc++/lib: Makefile
src/tests/lib/libc/sync: cpp_atomic_ops_linkable.cc
Log Message:
Remove LLVM atomic hacks for Sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libc++/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.9 src/external/bsd/libc++/lib/Makefile:1.10
--- src/external/bsd/libc++/lib/Makefile:1.9 Sat Feb 27 21:42:14 2016
+++ src/external/bsd/libc++/lib/Makefile Wed Jan 11 12:10:26 2017
@@ -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 @@ CWARNFLAGS.clang+= -Wno-error=implicit-e
LDFLAGS+= -Wl,-z,defs
-.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
-CXXFLAGS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
-.endif
-
.include <bsd.lib.mk>
Index: src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc
diff -u src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc:1.4 src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc:1.5
--- src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc:1.4 Sat Feb 27 18:50:39 2016
+++ src/tests/lib/libc/sync/cpp_atomic_ops_linkable.cc Wed Jan 11 12:10:26 2017
@@ -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 @@ private:
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 @@ int main(int argc, char **argv)
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 @@ int main(int argc, char **argv)
#ifdef __HAVE_ATOMIC64_OPS
ATest<intmax_t>();
ATest<uintmax_t>();
-#endif /* NO_SHORT_ATOMICS */
+#endif
}
