Changeset 73401643 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

8054f60

Parents:

5b12dbb

git-author:

Dzejrou <dzejrou@…> (2018-07-02 20:27:35)

git-committer:

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

Message:

cpp: c++ binaries are detected by source extensions, split c++ related macros in similar fashion to the c macros

Location:

uspace

Files:

• Makefile.common (modified) (3 diffs)
• app/cpptest/main.cpp (modified) (1 diff)

uspace/Makefile.common

@@ -79 +79 @@
         OUTPUTS += $(BINARY) $(BINARY).disasm
         EXTRA_CLEAN += $(BINARY).map
-endif
-
-ifneq ($(CXX_BINARY),)
-        JOB = $(CXX_BINARY).job
-        TEST_BINARY = test-$(CXX_BINARY)
-        OUTPUTS += $(CXX_BINARY) $(CXX_BINARY).disasm
-        EXTRA_CLEAN += $(CXX_BINARY).map
 endif
 
@@ -245 +238 @@
 # Flags for the compilation of C++ code.
 CXX_BASE_LIBS = $(LIBCPP_PREFIX)/libcpp.a $(BASE_LIBS)
-CXXFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(COMMON_CFLAGS) \
+DEFAULT_CXXFLAGS = \
+        -O$(OPTIMIZATION) \
+        -ffunction-sections \
+        -pipe \
+        -Wall \
+        -Wextra \
+        -Wno-unused-parameter \
+        -Wwrite-strings \
+        -Werror-implicit-function-declaration
+
+COMMON_CXXFLAGS = $(COMMON_CFLAGS)
+HELENOS_CXXFLAGS = \
+        -std=c++17 -frtti \
+        $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) \
         -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++17 -Werror-implicit-function-declaration \
-        -Wwrite-strings -pipe -ggdb -D__$(ENDIANESS)__
+        -D_HELENOS_SOURCE \
+        -fexec-charset=UTF-8 \
+        -finput-charset=UTF-8 \
+        -fno-common \
+        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+
+CXXFLAGS = $(COMMON_CPPFLAGS) $(COMMON_CXXFLAGS) $(HELENOS_CXXFLAGS) $(DEFAULT_CXXFLAGS)
 
 ## Setup platform configuration
@@ -326 +334 @@
 
 ifneq ($(BINARY),)
+
+ifeq ($(findstring ".cpp", $($suffix $(SOURCES))),)
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)
+        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
+else
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
         $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
 endif
 
-ifneq ($(CXX_BINARY),)
-$(CXX_BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)
-        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
 endif
 

uspace/app/cpptest/main.cpp

@@ +1 @@
+/*
+ * Copyright (c) 2018 Jaroslav Jindrak
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <__bits/test/tests.hpp>