Changeset c735afb in mainline

Timestamp:

2018-07-05T21:41:24Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

199b6d8

Parents:

b57a3ee

git-author:

Dzejrou <dzejrou@…> (2018-06-25 18:54:33)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:24)

Message:

cpp: fix problems caused by new HelenOS changes (and leftowers from rebase)

Location:

uspace/lib

Files:

• c/generic/elf/elf_load.c (modified) (1 diff)
• c/generic/elf/elf_mod.c (modified) (1 diff)
• c/include/loader/pcb.h (modified) (1 diff)
• cpp/include/__bits/random.hpp (modified) (1 diff)
• cpp/include/__bits/stdexcept.hpp (modified) (2 diffs)
• cpp/include/__bits/thread/threading.hpp (modified) (2 diffs)
• cpp/include/csetjmp (modified) (2 diffs)
• cpp/include/cstdlib (modified) (2 diffs)
• cpp/src/string.cpp (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -112 +112 @@
         pcb->dynamic = info->finfo.dynamic;
         pcb->rtld_runtime = info->env;
-        pcb->cpp_data = info->finfo.cpp_data;
 }
 

uspace/lib/c/generic/elf/elf_mod.c

@@ -200 +200 @@
         elf->info->interp = NULL;
         elf->info->dynamic = NULL;
-        elf->info->cpp_data.ctors_count = 0;
-        elf->info->cpp_data.dtors_count = 0;
 
         if (phdr_len > sizeof(phdr)) {

uspace/lib/c/include/loader/pcb.h

@@ -75 +75 @@
         /** Pointer to dynamic linker state structure (rtld_t). */
         void *rtld_runtime;
-        /** C++ related data. */
-        cpp_data_t cpp_data;
 } pcb_t;
 

uspace/lib/cpp/include/__bits/random.hpp

@@ -1030 +1030 @@
              *       something better.
              */
-            hel::srandom(hel::time(nullptr));
+            hel::srand(hel::time(nullptr));
         }
 
         result_type operator()()
         {
-            return hel::random();
+            return hel::rand();
         }
 

uspace/lib/cpp/include/__bits/stdexcept.hpp

@@ -49 +49 @@
 
         protected:
-            const char* what_;
+            char* what_;
     };
 
@@ -96 +96 @@
 
         protected:
-            const char* what_;
+            char* what_;
     };
 

uspace/lib/cpp/include/__bits/thread/threading.hpp

@@ -33 +33 @@
 {
     extern "C" {
+        #include <async.h>
         #include <fibril.h>
         #include <fibril_synch.h>
@@ -157 +158 @@
             static void sleep(time_unit time)
             {
-                hel::fibril_usleep(time);
+                hel::async_usleep(time);
             }
         };

uspace/lib/cpp/include/csetjmp

@@ -32 +32 @@
 #include <__bits/common.hpp>
 
+/**
+ * TODO: Currently the <setjmp.h> header uses
+ *       _Noreturn, which is not available in C++.
+ */
+
 namespace std::hel
 {
     extern "C" {
-        #include <setjmp.h>
+        //#include <setjmp.h>
     }
 }
@@ -41 +46 @@
 namespace std
 {
-    using std::hel::jmp_buf;
-    using std::hel::longjmp;
+    /* using std::hel::jmp_buf; */
+    /* using std::hel::longjmp; */
 }
 
-using std::hel::jmp_buf;
-using std::hel::longjmp;
+/* using std::hel::jmp_buf; */
+/* using std::hel::longjmp; */
 
 #endif

uspace/lib/cpp/include/cstdlib

@@ -78 +78 @@
     /* using std::hel::wcstombs; */
 
-    using std::hel::random; // Supposed to be rand.
-    using std::hel::srandom; // Supposed to be srand.
+    using std::hel::rand;
+    using std::hel::srand;
     using std::hel::qsort;
     /* using std::hel::bsearch; */
@@ -127 +127 @@
 /* using std::hel::wcstombs; */
 
-using std::hel::random; // Supposed to be rand.
-using std::hel::srandom; // Supposed to be srand.
+using std::hel::rand;
+using std::hel::srand;
 using std::hel::qsort;
 /* using std::hel::bsearch; */

uspace/lib/cpp/src/string.cpp

@@ -99 +99 @@
     }
 
+    namespace hel
+    {
+        extern "C" int asprintf(char**, const char*, ...);
+    }
+
     string to_string(int val)
     {