Module: xenomai-3
Branch: stable-3.0.x
Commit: 0ef9dbd42d16d702899624c4e58fa39815574461
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=0ef9dbd42d16d702899624c4e58fa39815574461

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Mar  4 12:45:46 2017 +0100

Revert "lib/cobalt: wrap CXXABI One-time Constructor functions"

This reverts commit be90f09cf277083ff7021b1f0f1a856c66c42b46.

See http://xenomai.org/pipermail/xenomai/2017-March/037184.html

---

 lib/cobalt/assert.wrappers  |    3 ---
 lib/cobalt/assert_context.c |   19 -------------------
 lib/cobalt/internal.h       |   12 ------------
 lib/cobalt/wrappers.c       |   37 -------------------------------------
 4 files changed, 71 deletions(-)

diff --git a/lib/cobalt/assert.wrappers b/lib/cobalt/assert.wrappers
index 65320ab..7164858 100644
--- a/lib/cobalt/assert.wrappers
+++ b/lib/cobalt/assert.wrappers
@@ -1,5 +1,2 @@
 --wrap malloc
 --wrap free
---wrap __cxa_guard_acquire
---wrap __cxa_guard_release
---wrap __cxa_guard_abort
diff --git a/lib/cobalt/assert_context.c b/lib/cobalt/assert_context.c
index fd18d6b..2085953 100644
--- a/lib/cobalt/assert_context.c
+++ b/lib/cobalt/assert_context.c
@@ -66,22 +66,3 @@ COBALT_IMPL(void, free, (void *ptr))
        assert_nrt();
        __STD(free(ptr));
 }
-
-/* CXXABI 3.3.2 One-time Construction API */
-COBALT_IMPL(int, __cxa_guard_acquire, (__guard *g))
-{
-       assert_nrt();
-       return __STD(__cxa_guard_acquire(g));
-}
-
-COBALT_IMPL(void, __cxa_guard_release, (__guard *g))
-{
-       assert_nrt();
-       __STD(__cxa_guard_release(g));
-}
-
-COBALT_IMPL(void, __cxa_guard_abort, (__guard *g))
-{
-       assert_nrt();
-       __STD(__cxa_guard_abort(g));
-}
diff --git a/lib/cobalt/internal.h b/lib/cobalt/internal.h
index 9f58c6a..fee3fe1 100644
--- a/lib/cobalt/internal.h
+++ b/lib/cobalt/internal.h
@@ -73,16 +73,4 @@ void cobalt_check_features(struct cobalt_featinfo *finfo);
 
 extern struct sigaction __cobalt_orig_sigdebug;
 
-#ifdef __ARM_EABI__
-typedef uint32_t __guard;
-#else
-typedef uint64_t __guard;
-#endif
-int __real___cxa_guard_acquire(__guard*);
-void __real___cxa_guard_release(__guard*);
-void __real___cxa_guard_abort(__guard*);
-int __cxa_guard_acquire(__guard*);
-void __cxa_guard_release(__guard*);
-void __cxa_guard_abort(__guard*);
-
 #endif /* _LIB_COBALT_INTERNAL_H */
diff --git a/lib/cobalt/wrappers.c b/lib/cobalt/wrappers.c
index 65dc3bd..09c74e5 100644
--- a/lib/cobalt/wrappers.c
+++ b/lib/cobalt/wrappers.c
@@ -43,7 +43,6 @@
 #include <unistd.h>
 #include <malloc.h>
 #include <boilerplate/compiler.h>
-#include <internal.h>
 
 /* sched */
 __weak
@@ -533,39 +532,3 @@ unsigned int __real_sleep(unsigned int seconds)
 {
        return sleep(seconds);
 }
-
-__weak
-int __real___cxa_guard_acquire(__guard *g)
-{
-       return __cxa_guard_acquire(g);
-}
-
-__weak
-void __real___cxa_guard_release(__guard *g)
-{
-       return __cxa_guard_release(g);
-}
-
-__weak
-void __real___cxa_guard_abort(__guard *g)
-{
-       return __cxa_guard_abort(g);
-}
-
-__weak
-int __cxa_guard_acquire(__guard *g)
-{
-       return 0;
-}
-
-__weak
-void __cxa_guard_release(__guard *g)
-{
-       return;
-}
-
-__weak
-void __cxa_guard_abort(__guard *g)
-{
-       return;
-}


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to