Changeset bc73be3 in mainline for uspace/lib/cpp/src/__bits/runtime.cpp

Timestamp:

2019-06-27T08:51:20Z (5 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• uspace/lib/cpp/src/__bits/runtime.cpp (modified) (1 diff)

uspace/lib/cpp/src/__bits/runtime.cpp

@@ -70 +70 @@
     }
 
+#ifdef __arm__
+    extern "C" int __aeabi_atexit(void* p, void (*f)(void*), void* d)
+    {
+        return __cxa_atexit(f, p, d);
+    }
+#endif
+
     extern "C" int __cxa_atexit(void (*f)(void*), void* p, void* d)
     {