Merge pull request #1273 from fwsGonzo/dev

Add support for building with g++

Author: fwsGonzo

CMakeLists.txt

@@ -14,7 +14,7 @@ set(SCRIPTS ${CMAKE_INSTALL_PREFIX}/includeos/scripts)
 if(CMAKE_COMPILER_IS_GNUCC)
 	# currently gcc is not supported due to problems cross-compiling a unikernel
 	# (i.e., building a 32bit unikernel (only supported for now) on a 64bit system)
-	message(FATAL_ERROR "Building IncludeOS with gcc is not currently supported. Please clean-up build directory and configure for clang through CC and CXX environmental variables.")
+#	message(FATAL_ERROR "Building IncludeOS with gcc is not currently supported. Please clean-up build directory and configure for clang through CC and CXX environmental variables.")
 endif(CMAKE_COMPILER_IS_GNUCC)
 
 # create OS version string from git describe (used in CXX flags)
@@ -92,12 +92,19 @@ endif(silent)
 # Append optimization level
 set(CAPABS "${CAPABS} ${OPTIMIZE}")
 
-# these kinda work with llvm
-set(CMAKE_CXX_FLAGS "-target i686 -MMD ${CAPABS} ${WARNS} -nostdlib -nostdlibinc -c -m32 -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION=\\\"${OS_VERSION}\\\"")
-set(CMAKE_C_FLAGS "-target i686 -MMD ${CAPABS} ${WARNS} -nostdlib -nostdlibinc -c -m32 -DOS_VERSION=\"\"${OS_VERSION}\"\"")
+if (CMAKE_COMPILER_IS_GNUCC)
+  # gcc/g++ settings
+  set(CMAKE_CXX_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -Wno-frame-address -nostdlib -c -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION=\\\"${OS_VERSION}\\\"")
+  set(CMAKE_C_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -c -DOS_VERSION=\"\"${OS_VERSION}\"\"")
+else()
+  # these kinda work with llvm
+  set(CMAKE_CXX_FLAGS "-target i686 -MMD ${CAPABS} ${WARNS} -nostdlib -nostdlibinc -c -m32 -std=c++14 -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION=\\\"${OS_VERSION}\\\"")
+  set(CMAKE_C_FLAGS "-target i686 -MMD ${CAPABS} ${WARNS} -nostdlib -nostdlibinc -c -m32 -DOS_VERSION=\"\"${OS_VERSION}\"\"")
+endif()
 
 # either download or cross-compile needed libraries
-option(from_bundle "Download and use pre-compiled libraries for cross-comilation" ON)
+#option(from_bundle "Download and use pre-compiled libraries for cross-comilation" ON)
+set(BUNDLE_LOC "" CACHE STRING "Local path of bundle with pre-compile libraries")
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cross_compiled_libraries.txt)
 
 # Botan Crypto & TLS

api/fs/common.hpp

@@ -188,7 +188,7 @@ namespace fs {
   using on_init_func  = delegate<void(error_t, File_system&)>;
   using on_ls_func    = delegate<void(error_t, dirvec_t)>;
   using on_read_func  = delegate<void(error_t, buffer_t, uint64_t)>;
-  using on_stat_func  = delegate<void(error_t, const Dirent&)>;
+  using on_stat_func  = delegate<void(error_t, Dirent)>;
 
 
   struct List

api/net/inet.hpp

@@ -179,7 +179,7 @@ namespace net {
     ///
 
     /** Get Maximum Transmission Unit **/
-    virtual constexpr uint16_t MTU() const = 0;
+    virtual uint16_t MTU() const = 0;
 
     /** Provision empty anonymous packet **/
     virtual Packet_ptr create_packet() = 0;

api/net/ip4/ip4.hpp

@@ -57,7 +57,7 @@ namespace net {
     /*
       Maximum Datagram Data Size
     */
-    constexpr uint16_t MDDS() const
+    uint16_t MDDS() const
     { return stack_.MTU() - sizeof(ip4::Header); }
 
     /** Upstream: Input from link layer */

api/net/ip4/udp.hpp

@@ -133,7 +133,7 @@ namespace net {
     // create and transmit @num packets from sendq
     void process_sendq(size_t num);
 
-    inline constexpr uint16_t max_datagram_size() noexcept {
+    uint16_t max_datagram_size() noexcept {
       return stack().ip_obj().MDDS() - sizeof(header);
     }
 

api/net/tcp/connection.hpp

@@ -498,7 +498,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
    *
    * @return     True if able to send, False otherwise.
    */
-  constexpr bool can_send() const noexcept
+  bool can_send() const noexcept
   { return (usable_window() >= SMSS()) and writeq.has_remaining_requests(); }
 
   /**
@@ -756,6 +756,8 @@ class Connection : public std::enable_shared_from_this<Connection> {
       recover = ISS; // [RFC 6582]
     }
 
+    uint32_t get_ts_recent() const noexcept { return TS_recent; }
+
     bool slow_start() const noexcept
     { return cwnd < ssthresh; }
 
@@ -1115,7 +1117,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
    *
    * @return     True if able to send one, False otherwise.
    */
-  constexpr bool can_send_one() const
+  bool can_send_one() const
   { return send_window() >= SMSS() and writeq.has_remaining_requests(); }
 
   /**

api/net/tcp/tcp.hpp

@@ -354,7 +354,7 @@ namespace net {
      *
      * @return     The window size
      */
-    constexpr uint32_t window_size() const
+    uint32_t window_size() const
     { return win_size_; }
 
     /**
@@ -371,7 +371,7 @@ namespace net {
      *
      * @return     The wscale factor
      */
-    constexpr uint8_t wscale() const
+    uint8_t wscale() const
     { return wscale_; }
 
     /**
@@ -380,7 +380,7 @@ namespace net {
      *
      * @return     Whether wscale is being used
      */
-    constexpr bool uses_wscale() const
+    bool uses_wscale() const
     { return wscale_ > 0; }
 
     /**
@@ -396,7 +396,7 @@ namespace net {
      *
      * @return     Whether the TCP instance is using Timestamp Options or not
      */
-    constexpr bool uses_timestamps() const
+    bool uses_timestamps() const
     { return timestamps_; }
 
     /**
@@ -428,7 +428,7 @@ namespace net {
      *
      * @return     The limit
      */
-    constexpr uint16_t max_syn_backlog() const
+    uint16_t max_syn_backlog() const
     { return max_syn_backlog_; }
 
     /**
@@ -438,7 +438,7 @@ namespace net {
      *
      * @return     The MSS
      */
-    constexpr uint16_t MSS() const
+    uint16_t MSS() const
     { return network().MDDS() - sizeof(tcp::Header); }
 
     /**

api/net/tls/server.hpp

@@ -38,7 +38,7 @@ class Server : public Botan::TLS::Callbacks, public tcp::Stream
   Server(Connection_ptr remote,
          Botan::RandomNumberGenerator& rng,
          Botan::Credentials_Manager& credman)
-  : tcp::Stream({remote}),
+  : tcp::Stream{remote},
     m_creds(credman),
     m_session_manager(),
     m_tls(*this, m_session_manager, m_creds, m_policy, rng)

api/smp

@@ -133,7 +133,11 @@ public:
 };
 
 // access a std::array of structs indexed by current CPU id
+#ifdef INCLUDEOS_SINGLE_THREADED
+#define PER_CPU(x) (per_cpu_help<decltype(x)::value_type, 1>(x))
+#else
 #define PER_CPU(x) (per_cpu_help<decltype(x)::value_type, x.size()>(x))
+#endif
 
 #ifndef ARCH_X86
 typedef int spinlock_t;
@@ -142,4 +146,3 @@ inline void unlock(spinlock_t&) {}
 #endif
 
 #endif
-

api/util/chunk.hpp

@@ -97,7 +97,7 @@ class Chunk {
    *
    * @return The byte at index
    */
-  constexpr byte_t& operator[](index_type idx) const noexcept
+  byte_t& operator[](index_type idx) const noexcept
   { return data()[idx]; }
 
   /**
@@ -193,14 +193,14 @@ class Chunk {
 
     iterator& operator=(const iterator&) noexcept = default;
 
-    constexpr reference operator*() const
+    reference operator*() const
     {
       Expects(chunk_ && *chunk_);
 
       return (*chunk_)[index_];
     }
 
-    constexpr pointer operator->() const
+    pointer operator->() const
     {
       Expects(chunk_ && *chunk_);