Merge pull request #647 from ckormanyos/update_rl78

ckormanyos · web-flow · commit 504e89471bb6 · 2025-05-17T13:55:09.000+02:00
Upgrage rl78 for intended GCC 15.1
diff --git a/ref_app/src/app/benchmark/app_benchmark_trapezoid_integral.cpp b/ref_app/src/app/benchmark/app_benchmark_trapezoid_integral.cpp
@@ -28,7 +28,12 @@
 
 #endif
 
-#if (defined(STDFLOAT_FLOAT64_NATIVE_TYPE) || (defined(__STDCPP_FLOAT64_T__) && (__STDCPP_FLOAT64_T__ == 1)))
+#if (defined(__GNUC__) && defined(__RL78__))
+
+using local_float_type = std::float32_t;
+static_assert((std::numeric_limits<local_float_type>::digits >= 24), "Error: Incorrect local_float_type type definition");
+
+#elif (defined(STDFLOAT_FLOAT64_NATIVE_TYPE) || (defined(__STDCPP_FLOAT64_T__) && (__STDCPP_FLOAT64_T__ == 1)))
 
 using local_float_type = std::float64_t;
 static_assert((std::numeric_limits<local_float_type>::digits >= 53), "Error: Incorrect local_float_type type definition");
diff --git a/ref_app/src/math/calculus/integral.h b/ref_app/src/math/calculus/integral.h
@@ -38,7 +38,7 @@
        {
          const std::uint_fast32_t two_j_plus_one { (j * UINT32_C(2)) + UINT32_C(1) };
 
-         sum += real_function(a + real_value_type(step * two_j_plus_one));
+         sum += real_function(a + real_value_type(step * static_cast<real_value_type>(two_j_plus_one)));
        }
 
        const real_value_type tmp { result };
diff --git a/ref_app/src/util/STL/cinttypes b/ref_app/src/util/STL/cinttypes
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-//  Copyright Christopher Kormanyos 2021.
+//  Copyright Christopher Kormanyos 2021 - 2025.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -8,7 +8,11 @@
 #ifndef CINTTYPES_2021_10_19_
   #define CINTTYPES_2021_10_19_
 
+  #if (defined(__GNUC__) && defined(__RL78__))
+  #include <stdint-gcc.h>
+  #else
   #include <inttypes.h>
+  #endif
   #include <cstdint>
 
   namespace std
diff --git a/ref_app/src/util/STL/cmath b/ref_app/src/util/STL/cmath
@@ -725,13 +725,22 @@
     template<typename FloatType>
     inline bool isinf_impl(FloatType x)
     {
+      #if defined(__GNUC__)
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored "-Wfloat-equal"
+      #endif
+
       using float_type = FloatType;
 
       return
       (
            ( x == std::numeric_limits<float_type>::infinity())
         || (-x == std::numeric_limits<float_type>::infinity())
       );
+
+      #if defined(__GNUC__)
+      #pragma GCC diagnostic pop
+      #endif
     }
 
     } // namespace cmath_detail
diff --git a/ref_app/src/util/STL/stdfloat b/ref_app/src/util/STL/stdfloat
@@ -26,6 +26,11 @@
     #define __STDCPP_FLOAT64_T__ 1
     #endif
 
+    #elif (defined(__GNUC__) && defined(__RL78__))
+
+    using float64_t = long double;
+    #define __STDCPP_FLOAT64_T__ 1
+
     #else
 
     using float64_t = double;
diff --git a/ref_app/target/micros/rl78/make/rl78.ld b/ref_app/target/micros/rl78/make/rl78.ld
@@ -1,10 +1,12 @@
 /*
- Copyright Christopher Kormanyos 2007 - 2024.
+ Copyright Christopher Kormanyos 2007 - 2025.
  Distributed under the Boost Software License,
  Version 1.0. (See accompanying file LICENSE_1_0.txt
  or copy at http://www.boost.org/LICENSE_1_0.txt)
 */
 
+INPUT(libc.a libm.a libgcc.a)
+
 OUTPUT_ARCH(rl78)
 
 /* The beginning and end of the program ROM area */
diff --git a/ref_app/target/micros/rl78/make/rl78_flags.gmk b/ref_app/target/micros/rl78/make/rl78_flags.gmk
@@ -1,5 +1,5 @@
 #
-#  Copyright Christopher Kormanyos 2014 -2024.
+#  Copyright Christopher Kormanyos 2014 -2025.
 #  Distributed under the Boost Software License,
 #  Version 1.0. (See accompanying file LICENSE_1_0.txt
 #  or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,7 +9,7 @@
 # compiler flags for the target architecture
 # ------------------------------------------------------------------------------
 
-GCC_VERSION   = 13.2.0
+GCC_VERSION   = 15.1.0
 GCC_TARGET    = rl78-unknown-elf
 GCC_PREFIX    = rl78-unknown-elf
 
@@ -18,21 +18,22 @@ TGT_SUFFIX    = elf
 TGT_ALLFLAGS  = -Os                                            \
                 -mcpu=g13                                      \
                 -mmul=g13                                      \
-                -fno-inline-functions
+                -fno-inline-functions                          \
+                -ffreestanding
 
-TGT_CFLAGS    = -std=c99                                       \
+TGT_CFLAGS    = -std=c11                                       \
                 -Wunsuffixed-float-constants                   \
                 $(TGT_ALLFLAGS)
 
-TGT_CXXFLAGS  = -std=c++14                                     \
+TGT_CXXFLAGS  = -std=c++20                                     \
                 $(TGT_ALLFLAGS)
 
-TGT_INCLUDES  = -isystem $(PATH_APP)/util/STL
+TGT_INCLUDES  = -isystem$(PATH_APP)/util/STL
 
 TGT_AFLAGS    =
 
 TGT_LDFLAGS   = -nostartfiles                                  \
+                -nostdlib                                      \
                 -Wl,--gc-sections                              \
                 -Wl,-Map,$(APP).map                            \
-                -T $(LINKER_DEFINITION_FILE)                   \
-                --specs=nosys.specs
+                -T $(LINKER_DEFINITION_FILE)
diff --git a/ref_app/target/micros/stm32f446/make/stm32f446_flags.gmk b/ref_app/target/micros/stm32f446/make/stm32f446_flags.gmk
@@ -33,7 +33,9 @@ TGT_CXXFLAGS  = -std=c++14
                 -Wno-psabi                                                        \
                 $(TGT_ALLFLAGS)
 
-TGT_INCLUDES  = -isystem $(PATH_APP)/util/STL
+INC_PREFIX   := -isystem
+
+TGT_INCLUDES  = $(INC_PREFIX)$(PATH_APP)/util/STL
 
 TGT_AFLAGS    =
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`{`
`39`	`39`	`const std::uint_fast32_t two_j_plus_one { (j * UINT32_C(2)) + UINT32_C(1) };`
`40`	`40`
`41`		`- sum += real_function(a + real_value_type(step * two_j_plus_one));`
	`41`	`+ sum += real_function(a + real_value_type(step * static_cast<real_value_type>(two_j_plus_one)));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`const real_value_type tmp { result };`