Merge pull request #1431 from fwsGonzo/dev

Enable compiling and running on g++

Author: fwsGonzo

CMakeLists.txt

@@ -110,6 +110,21 @@ endif(silent)
 # Append optimization level
 set(CAPABS "${CAPABS} ${OPTIMIZE}")
 
+# object format needs to be set BEFORE enabling ASM
+# see: https://cmake.org/Bug/bug_relationship_graph.php?bug_id=13166
+if ("${ARCH}" STREQUAL "i686")
+  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
+  set(OBJCOPY_TARGET "elf32-i386")
+  set(CAPABS "${CAPABS} -m32")
+else()
+  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf64")
+  set(OBJCOPY_TARGET "elf64-x86-64")
+  set(CAPABS "${CAPABS} -m64")
+endif()
+
+enable_language(ASM_NASM)
+
+# initialize C and C++ compiler flags
 if (CMAKE_COMPILER_IS_GNUCC)
   # gcc/g++ settings
   set(CMAKE_CXX_FLAGS " -MMD ${CAPABS} ${WARNS} -Wno-frame-address -nostdlib -fno-omit-frame-pointer -c -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION=\\\"${OS_VERSION}\\\"")
@@ -125,18 +140,6 @@ endif()
 set(BUNDLE_LOC "" CACHE STRING "Local path of bundle with pre-compile libraries")
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cross_compiled_libraries.txt)
 
-# object format needs to be set BEFORE enabling ASM
-# see: https://cmake.org/Bug/bug_relationship_graph.php?bug_id=13166
-if ("${ARCH}" STREQUAL "i686")
-  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
-  set(OBJCOPY_TARGET "elf32-i386")
-else()
-  set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf64")
-  set(OBJCOPY_TARGET "elf64-x86-64")
-endif()
-
-enable_language(ASM_NASM)
-
 # Botan Crypto & TLS
 # Note: Include order matters!
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/botan.cmake)

api/net/dhcp/options.hpp

@@ -215,7 +215,7 @@ struct domain_name_servers : public type<DOMAIN_NAME_SERVERS>, public addr_optio
  */
 struct domain_name : public type<DOMAIN_NAME>, public base
 {
-  constexpr domain_name(const std::string& dname) noexcept
+  domain_name(const std::string& dname) noexcept
     : base{type::CODE, static_cast<uint8_t>(dname.size())}
   {
     std::memcpy(&val[0], dname.data(), dname.size());
@@ -296,7 +296,7 @@ struct server_identifier : public type<DHCP_SERVER_IDENTIFIER>, public addr_opti
  */
 struct param_req_list : public type<DHCP_PARAMETER_REQUEST_LIST>, public base
 {
-  constexpr param_req_list(const std::vector<Code>& codes) noexcept
+  param_req_list(const std::vector<Code>& codes) noexcept
     : base{DHCP_PARAMETER_REQUEST_LIST, static_cast<uint8_t>(codes.size())}
   {
     Expects(codes.size() < 50); // or something
@@ -309,7 +309,7 @@ struct param_req_list : public type<DHCP_PARAMETER_REQUEST_LIST>, public base
  */
 struct message : public type<DHCP_MESSAGE>, public base
 {
-  constexpr message(const std::string& msg) noexcept
+  message(const std::string& msg) noexcept
     : base{CODE, static_cast<uint8_t>(msg.size())}
   {
     Expects(not msg.empty() and msg.size() <= 128); // or something

api/net/inet.hpp

@@ -138,9 +138,9 @@ namespace net {
         return pckt;
       }
 
-      Filter_chain(const char* chain_name, std::initializer_list<Packetfilter> filters) :
-        chain{filters},
-        name{chain_name} {}
+      Filter_chain(const char* chain_name, std::initializer_list<Packetfilter> filters)
+        : chain(filters), name{chain_name}
+      {}
     };
 
     /**

api/net/tcp/connection.inc

@@ -10,7 +10,7 @@ inline Connection& Connection::on_connect(ConnectCallback cb) {
 
 inline Connection& Connection::on_read(size_t recv_bufsz, ReadCallback cb)
 {
-  read_request = std::make_unique<ReadRequest>(recv_bufsz, this->cb.RCV.NXT, cb);
+  read_request = std::make_unique<ReadRequest>(recv_bufsz, seq_t(this->cb.RCV.NXT), cb);
   return *this;
 }
 

api/util/statman.hpp

@@ -100,7 +100,7 @@ class Stat {
   Stat& operator=(const Stat& other) = delete;
   Stat& operator=(Stat&& other) = delete;
 
-} __attribute__((packed)); //< class Stat
+}; //< class Stat
 
 
 class Statman {

cmake/post.service.cmake

@@ -15,21 +15,23 @@ set(CMAKE_CXX_COMPILER_TARGET ${TRIPLE})
 set(CMAKE_C_COMPILER_TARGET ${TRIPLE})
 message(STATUS "Target triple ${TRIPLE}")
 
+# defines $CAPABS depending on installation
+include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
+
 # Arch-specific defines & options
 if ("${ARCH}" STREQUAL "x86_64")
   set(ARCH_INTERNAL "ARCH_X64")
   set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf64")
   set(OBJCOPY_TARGET "elf64-x86-64")
+  set(CAPABS "${CAPABS} -m64")
 else()
   set(ARCH_INTERNAL "ARCH_X86")
   set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
   set(OBJCOPY_TARGET "elf32-i386")
+  set(CAPABS "${CAPABS} -m32")
 endif()
 enable_language(ASM_NASM)
 
-# defines $CAPABS depending on installation
-include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
-
 # Various global defines
 # * OS_TERMINATE_ON_CONTRACT_VIOLATION provides classic assert-like output from Expects / Ensures
 # * _GNU_SOURCE enables POSIX-extensions in newlib, such as strnlen. ("everything newlib has", ref. cdefs.h)
@@ -46,8 +48,8 @@ if (debug)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_CXX_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")
-  set(CMAKE_C_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c")
+  set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")
+  set(CMAKE_C_FLAGS "-MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c")
 else()
   # these kinda work with llvm
   set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${OPTIMIZE} ${WARNS} -nostdlib -nostdlibinc -fno-omit-frame-pointer -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1")

src/kernel/kernel_start.cpp

@@ -36,9 +36,9 @@ extern "C" {
 
 extern void default_stdout_handlers();
 
-__attribute__((weak))
 extern "C"
-void kernel_start(uintptr_t magic, uintptr_t addr)
+void __attribute__((weak))
+kernel_start(uintptr_t magic, uintptr_t addr)
 {
 
   // Initialize default serial port