Changeset a57a79c in mainline

Timestamp:

2018-07-05T21:41:19Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

9317f45

Parents:

0564a02e

git-author:

Dzejrou <dzejrou@…> (2017-11-26 03:10:14)

git-committer:

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

Message:

cpp: fixed issues created by the addition of abi/_bits, changes to the build system and added <cwchar> that was made possible by the addition of <wchar.h> to libc

Files:

• abi/include/_bits/wchar_t.h (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/cpptest/Makefile (modified) (1 diff)
• uspace/lib/c/include/stddef.h (modified) (1 diff)
• uspace/lib/cpp/Makefile (modified) (1 diff)
• uspace/lib/cpp/include/cwchar (added)
• uspace/lib/cpp/include/impl/string.hpp (modified) (1 diff)

abi/include/_bits/wchar_t.h

@@ -43 +43 @@
 #include <_bits/macros.h>
 
+#ifndef __cplusplus
 typedef __WCHAR_TYPE__ wchar_t;
+#endif
 
 #endif

uspace/Makefile

@@ -216 +216 @@
 BASE_LIBS = \
         lib/c \
+        lib/cpp \
         lib/softint \
         lib/softfloat \
@@ -221 +222 @@
 
 LIBS = \
-        lib/cpp \
         lib/fs \
         lib/block \

uspace/app/cpptest/Makefile

@@ -30 +30 @@
 
 # TODO: Force linker to link libcpp by default when linking cpp apps?
-LIBS = $(USPACE_PREFIX)/lib/cpp/libcpp.a
+LIBS = cpp
 
 BINARY = cpptest

uspace/lib/c/include/stddef.h

@@ -37 +37 @@
 
 #include <_bits/size_t.h>
+#include <_bits/ssize_t.h>
 #include <_bits/ptrdiff_t.h>
 #include <_bits/wchar_t.h>

uspace/lib/cpp/Makefile

@@ -33 +33 @@
 
 LIBRARY = libcpp
-SLIBRARY = libcpp.so.0.0
-LSONAME = libcpp.so.0
+SOVERSION = 0.0
 
 -include $(CONFIG_MAKEFILE)

uspace/lib/cpp/include/impl/string.hpp

@@ -36 +36 @@
 #include <cstdlib>
 #include <cstring>
+#include <cwchar>
 #include <memory>
 #include <utility>