Source-Changes-HG archive

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

[src/trunk]: src Remove atomic hack for ARM, libc now provides the missing sy...



details:   https://anonhg.NetBSD.org/src/rev/3864fbbe38b2
branches:  trunk
changeset: 330342:3864fbbe38b2
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jul 05 20:45:49 2014 +0000

description:
Remove atomic hack for ARM, libc now provides the missing symbols.

diffstat:

 doc/TODO.clang                                |   6 +-----
 external/bsd/libc++/lib/Makefile              |  16 +---------------
 external/bsd/llvm/lib/libLLVMSupport/Makefile |  11 +----------
 3 files changed, 3 insertions(+), 30 deletions(-)

diffs (72 lines):

diff -r af0f01d12f52 -r 3864fbbe38b2 doc/TODO.clang
--- a/doc/TODO.clang    Sat Jul 05 20:44:46 2014 +0000
+++ b/doc/TODO.clang    Sat Jul 05 20:45:49 2014 +0000
@@ -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 @@
 "-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.
diff -r af0f01d12f52 -r 3864fbbe38b2 external/bsd/libc++/lib/Makefile
--- a/external/bsd/libc++/lib/Makefile  Sat Jul 05 20:44:46 2014 +0000
+++ b/external/bsd/libc++/lib/Makefile  Sat Jul 05 20:45:49 2014 +0000
@@ -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 @@
 
 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>
diff -r af0f01d12f52 -r 3864fbbe38b2 external/bsd/llvm/lib/libLLVMSupport/Makefile
--- a/external/bsd/llvm/lib/libLLVMSupport/Makefile     Sat Jul 05 20:44:46 2014 +0000
+++ b/external/bsd/llvm/lib/libLLVMSupport/Makefile     Sat Jul 05 20:45:49 2014 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index