Module Name: src
Committed By: joerg
Date: Sat Jul 5 20:45:49 UTC 2014
Modified Files:
src/doc: TODO.clang
src/external/bsd/libc++/lib: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
Log Message:
Remove atomic hack for ARM, libc now provides the missing symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/doc/TODO.clang
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libc++/lib/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.10 src/doc/TODO.clang:1.11
--- src/doc/TODO.clang:1.10 Sat Jun 28 20:18:15 2014
+++ src/doc/TODO.clang Sat Jul 5 20:45:49 2014
@@ -1,4 +1,4 @@
-$NetBSD: TODO.clang,v 1.10 2014/06/28 20:18:15 joerg Exp $
+$NetBSD: TODO.clang,v 1.11 2014/07/05 20:45:49 joerg Exp $
Hacks for the clang integration
-------------------------------
@@ -6,9 +6,5 @@ Hacks for the clang integration
"-no-integrated-as" is used in src/sys/arch/i386/stand to compensate
for the incomplete explicit positioning support in LLVM MC.
-Missing atomic support in ARM libgcc, -march=armv6 "workaround":
- src/external/bsd/libc++/lib
- src/external/bsd/lllvm/lib/libLLVMSupport
-
Workaround for .fpu handling in src/sys/lib/libunwind for ARM by forcing
GNU as.
Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.5 src/external/bsd/libc++/lib/Makefile:1.6
--- src/external/bsd/libc++/lib/Makefile:1.5 Wed Jan 15 21:14:55 2014
+++ src/external/bsd/libc++/lib/Makefile Sat Jul 5 20:45:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/15 21:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/05 20:45:49 joerg Exp $
LIB= c++
WARNS= 4
@@ -46,18 +46,4 @@ CWARNFLAGS.clang+= -Wno-error=implicit-e
LDADD+= -Wl,-z,defs
-.if !empty(MACHINE_ARCH:M*arm*)
-# Missing __sync_fetch_and_add_4
-# Missing __sync_lock_test_and_set_4
-# Missing __sync_val_compare_and_swap_4
-# Missing __atomic_fetch_add_4
-COPTS.ios.cpp+= -march=armv6
-COPTS.locale.cpp+= -march=armv6
-COPTS.memory.cpp+= -march=armv6
-COPTS.new.cpp+= -march=armv6
-COPTS.rt_exception.cc+= -march=armv6
-COPTS.rt_guard.cc+= -march=armv6
-COPTS.stdexcept.cpp+= -march=armv6
-.endif
-
.include <bsd.lib.mk>
Index: src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.27 src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.28
--- src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.27 Fri May 30 18:28:14 2014
+++ src/external/bsd/llvm/lib/libLLVMSupport/Makefile Sat Jul 5 20:45:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/05/30 18:28:14 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2014/07/05 20:45:49 joerg Exp $
LIB= LLVMSupport
@@ -117,15 +117,6 @@ SRCS+= Host.inc \
CPPFLAGS.${src}+= -std=gnu99
.endfor
-.if !defined(HOSTLIB) && !empty(MACHINE_ARCH:M*arm*)
-# Missing __sync_fetch_and_add_4
-# Missing __sync_fetch_and_sub_4
-# Missing __sync_lock_test_and_set_4
-# Missing __sync_val_compare_and_swap_4
-# Missing __atomic_fetch_add_4
-COPTS.Atomic.cpp+= -march=armv6
-.endif
-
.if defined(HOSTLIB)
.include <bsd.hostlib.mk>
.else
