Changeset 058c240 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

b83ec692

Parents:

acf6b55

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-09 09:23:36)

git-committer:

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

Message:

cpp: added c++ to the build system, created libcpp, added and implemented the header file cstdio to libcpp

Files:

• tools/autotool.py (modified) (2 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/Makefile.common (modified) (3 diffs)
• uspace/lib/cpp/Makefile (added)
• uspace/lib/cpp/include/cstdio (added)

tools/autotool.py

@@ -323 +323 @@
 
         common['GCC'] = "%sgcc" % prefix
+        common['GPP'] = "%sg++" % prefix
 
         if (not path is None):
                 common['GCC'] = "%s/%s" % (path, common['GCC'])
+                common['GPP'] = "%s/%s" % (path, common['GPP'])
 
         check_app([common['GCC'], "--version"], "GNU GCC", details)
@@ -613 +615 @@
                         common['CC'] = " ".join([common['GCC']] + cc_args)
                         common['CC_AUTOGEN'] = common['CC']
+
+                        check_common(common, "GPP")
+                        common['CPP'] = common['GPP']
 
                 if (config['COMPILER'] == "gcc_native"):

uspace/Makefile

@@ -220 +220 @@
 
 LIBS = \
+        lib/cpp \
         lib/fs \
         lib/block \

uspace/Makefile.common

@@ -103 +103 @@
         -I$(LIBC_PREFIX)/arch/$(UARCH)/include \
         -I$(ROOT_PATH)/abi/include
+
+LIBCPP_PREFIX = $(LIB_PREFIX)/cpp
+LIBCPP_INCLUDES_FLAGS = -I$(LIBCPP_PREFIX)/include
+
 LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
@@ -232 +236 @@
 CFLAGS = $(COMMON_CPPFLAGS) $(COMMON_CFLAGS) $(HELENOS_CFLAGS) $(DEFAULT_CFLAGS)
 
+# Flags for the compilation of C++ code.
+CPPFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -ffunction-sections \
+        -nostdlib -nostdinc -Wall -Wextra -Wno-clobbered -Wno-unused-parameter \
+        -std=c++11 -Werror-implicit-function-declaration \
+        -Wwrite-strings -pipe -ggdb -D__$(ENDIANESS)__
+
 ## Setup platform configuration
 #
@@ -343 +355 @@
         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
 
+%.o: %.cpp | depend
+        $(CPP) $(CPPFLAGS) $(EXTRA_CPPFLAGS) -c $< -o $@
+
 %.test.o: %.c | depend
         $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)