pkg: require float_math where needed

maribu · maribu · commit 73f416081cd3 · 2025-09-18T14:57:42.000+02:00
diff --git a/pkg/cayenne-lpp/Makefile.dep b/pkg/cayenne-lpp/Makefile.dep
@@ -0,0 +1 @@
+FEATURES_REQUIRED += float_math
diff --git a/pkg/ccn-lite/Makefile.dep b/pkg/ccn-lite/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += ccn-lite-utils
 USEMODULE += gnrc_nettype_ccn
 USEMODULE += evtimer
diff --git a/pkg/cn-cbor/Makefile.dep b/pkg/cn-cbor/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += posix_headers
 
 # CN-CBOR is only supported by 32 bit architectures
diff --git a/pkg/emlearn/Makefile.dep b/pkg/emlearn/Makefile.dep
@@ -1,2 +1,4 @@
+FEATURES_REQUIRED += float_math
+
 # emlearn is not compatible with MSP430
 FEATURES_BLACKLIST += arch_msp430
diff --git a/pkg/flatbuffers/Makefile.dep b/pkg/flatbuffers/Makefile.dep
@@ -1 +1,3 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += cpp11-compat
diff --git a/pkg/jerryscript/Makefile.dep b/pkg/jerryscript/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += jerryscript-port-default
 USEMODULE += jerryscript-ext
 
diff --git a/pkg/libfixmath/Makefile.dep b/pkg/libfixmath/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 ifneq (,$(filter libfixmath-unittests,$(USEMODULE)))
   # libfixmath unittests use shift operand incompatible with 8bit
   # architecture int type.
diff --git a/pkg/libschc/Makefile.dep b/pkg/libschc/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 ifneq (,$(filter libschc_%,$(USEMODULE)))
   USEPKG += libschc
 endif
diff --git a/pkg/lora-serialization/Makefile.dep b/pkg/lora-serialization/Makefile.dep
@@ -0,0 +1 @@
+FEATURES_REQUIRED += float_math
diff --git a/pkg/lvgl/Makefile.dep b/pkg/lvgl/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += lvgl
 USEMODULE += lvgl_core
 USEMODULE += lvgl_draw
diff --git a/pkg/micropython/Makefile.dep b/pkg/micropython/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += xtimer
 USEMODULE += stdin
 
diff --git a/pkg/minmea/Makefile.dep b/pkg/minmea/Makefile.dep
@@ -0,0 +1 @@
+FEATURES_REQUIRED += float_math
diff --git a/pkg/mjson/Makefile.dep b/pkg/mjson/Makefile.dep
@@ -0,0 +1 @@
+FEATURES_REQUIRED += float_math
diff --git a/pkg/nanocbor/Makefile.dep b/pkg/nanocbor/Makefile.dep
@@ -0,0 +1 @@
+FEATURES_OPTIONAL += float_math
diff --git a/pkg/nanocbor/Makefile.include b/pkg/nanocbor/Makefile.include
@@ -1,2 +1,7 @@
 INCLUDES += -I$(RIOTPKG)/nanocbor/include
 INCLUDES += -I$(PKGDIRBASE)/nanocbor/include
+
+# Disable float functions if no float support is available
+ifneq (,$(filter float_math,$(FEATURES_USED)))
+  CFLAGS += -DNANOCBOR_ENABLE_FLOAT=0
+endif
diff --git a/pkg/nanocbor/patches/0001-config-Allow-disabling-of-float-arithmitc.patch b/pkg/nanocbor/patches/0001-config-Allow-disabling-of-float-arithmitc.patch
@@ -0,0 +1,109 @@
+From e29136bb10b7d763d633341e213112759c6893a0 Mon Sep 17 00:00:00 2001
+From: Marian Buschsieweke <marian.buschsieweke@ml-pa.com>
+Date: Wed, 17 Sep 2025 21:36:01 +0200
+Subject: [PATCH] config: Allow disabling of float arithmitc
+
+This can be useful for toolchains that cannot compile with any float
+arithmetic included. Otherwise with -ffunction-sections the linker would
+garbage collect unused float support anyway.
+---
+ examples/pretty-printer/main.c | 4 ++++
+ include/nanocbor/config.h      | 7 +++++++
+ src/decoder.c                  | 2 ++
+ src/encoder.c                  | 3 +++
+ 4 files changed, 16 insertions(+)
+
+diff --git a/examples/pretty-printer/main.c b/examples/pretty-printer/main.c
+index 9508ecf..1811f0a 100644
+--- a/examples/pretty-printer/main.c
++++ b/examples/pretty-printer/main.c
+@@ -144,6 +144,7 @@ static int _print_enter_array(nanocbor_value_t *value, unsigned indent)
+     return -1;
+ }
+ 
++#if NANOCBOR_ENABLE_FLOAT
+ static int _print_float(nanocbor_value_t *value)
+ {
+     bool test = false;
+@@ -173,6 +174,7 @@ static int _print_float(nanocbor_value_t *value)
+     }
+     return 0;
+ }
++#endif /* NANOCBOR_ENABLE_FLOAT */
+ 
+ /* NOLINTNEXTLINE(misc-no-recursion, readability-function-cognitive-complexity) */
+ static int _parse_type(nanocbor_value_t *value, unsigned indent)
+@@ -228,9 +230,11 @@ static int _parse_type(nanocbor_value_t *value, unsigned indent)
+     case NANOCBOR_TYPE_MAP: {
+         res = _print_enter_map(value, indent);
+     } break;
++#if NANOCBOR_ENABLE_FLOAT
+     case NANOCBOR_TYPE_FLOAT: {
+         res = _print_float(value);
+     } break;
++#endif /* NANOCBOR_ENABLE_FLOAT */
+     case NANOCBOR_TYPE_TAG: {
+         uint32_t tag = 0;
+         int res = nanocbor_get_tag(value, &tag);
+diff --git a/include/nanocbor/config.h b/include/nanocbor/config.h
+index a9e5463..bf4e135 100644
+--- a/include/nanocbor/config.h
++++ b/include/nanocbor/config.h
+@@ -79,6 +79,13 @@ extern "C" {
+ #endif
+ #endif
+ 
++/**
++ * @brief enable/disable support for float/double values
++ */
++#ifndef NANOCBOR_ENABLE_FLOAT
++#define NANOCBOR_ENABLE_FLOAT 1
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/src/decoder.c b/src/decoder.c
+index 5820659..4a59e01 100644
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -368,6 +368,7 @@ int nanocbor_get_simple(nanocbor_value_t *cvalue, uint8_t *value)
+     return res;
+ }
+ 
++#if NANOCBOR_ENABLE_FLOAT
+ /* float bit mask related defines */
+ #define FLOAT_EXP_OFFSET (127U)
+ #define FLOAT_SIZE (32U)
+@@ -475,6 +476,7 @@ int nanocbor_get_double(nanocbor_value_t *cvalue, double *value)
+     }
+     return _decode_double(cvalue, value);
+ }
++#endif /* NANOCBOR_ENABLE_FLOAT */
+ 
+ static int _enter_container(const nanocbor_value_t *it,
+                             nanocbor_value_t *container, uint8_t type)
+diff --git a/src/encoder.c b/src/encoder.c
+index ec0a4f6..c548fbd 100644
+--- a/src/encoder.c
++++ b/src/encoder.c
+@@ -230,6 +230,8 @@ int nanocbor_fmt_null(nanocbor_encoder_t *enc)
+     return _fmt_single(enc, NANOCBOR_MASK_FLOAT | NANOCBOR_SIMPLE_NULL);
+ }
+ 
++#if NANOCBOR_TYPE_FLOAT
++
+ /* Double bit mask related defines */
+ #define DOUBLE_EXP_OFFSET (1023U)
+ #define DOUBLE_SIZE (64U)
+@@ -393,6 +395,7 @@ int nanocbor_fmt_double(nanocbor_encoder_t *enc, double num)
+     return res;
+ #endif
+ }
++#endif /* NANOCBOR_TYPE_FLOAT */
+ 
+ int nanocbor_fmt_decimal_frac(nanocbor_encoder_t *enc, int32_t e, int32_t m)
+ {
+-- 
+2.43.0
+
diff --git a/pkg/qcbor/Makefile.dep b/pkg/qcbor/Makefile.dep
@@ -1 +1,2 @@
 FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
+FEATURES_REQUIRED += float_math
diff --git a/pkg/tflite-micro/Makefile.dep b/pkg/tflite-micro/Makefile.dep
@@ -1,9 +1,10 @@
-USEMODULE += cpp11-compat
+FEATURES_REQUIRED += float_math
 
 USEPKG += flatbuffers
 USEPKG += gemmlowp
 USEPKG += ruy
 
+USEMODULE += cpp11-compat
 USEMODULE += tflite-c
 USEMODULE += tflite-core-api
 USEMODULE += tflite-core-c
diff --git a/pkg/tinycbor/Makefile.dep b/pkg/tinycbor/Makefile.dep
@@ -1,2 +1,4 @@
 # tinycbor is only supported by 32 bit architectures
 FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
+
+FEATURES_REQUIRED += float_math
diff --git a/pkg/utensor/Makefile.dep b/pkg/utensor/Makefile.dep
@@ -1,4 +1,5 @@
 FEATURES_REQUIRED += cpp
+FEATURES_REQUIRED += float_math
 FEATURES_REQUIRED += libstdcpp
 
 USEMODULE += utensor-ops
diff --git a/pkg/wakaama/Makefile.dep b/pkg/wakaama/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += wakaama_core wakaama_core_coap wakaama_core_coap13 wakaama_data wakaama_client
 
 # include contrib code (platform adaption and client implementation)
diff --git a/pkg/wamr/Makefile.dep b/pkg/wamr/Makefile.dep
@@ -1,3 +1,5 @@
+FEATURES_REQUIRED += float_math
+
 USEMODULE += sema
 USEMODULE += ztimer64_msec
 USEMODULE += ztimer_usec

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`USEMODULE += ccn-lite-utils`
`2`	`4`	`USEMODULE += gnrc_nettype_ccn`
`3`	`5`	`USEMODULE += evtimer`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`USEMODULE += posix_headers`
`2`	`4`
`3`	`5`	`# CN-CBOR is only supported by 32 bit architectures`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`USEMODULE += cpp11-compat`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`USEMODULE += jerryscript-port-default`
`2`	`4`	`USEMODULE += jerryscript-ext`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`ifneq (,$(filter libfixmath-unittests,$(USEMODULE)))`
`2`	`4`	`# libfixmath unittests use shift operand incompatible with 8bit`
`3`	`5`	`# architecture int type.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`ifneq (,$(filter libschc_%,$(USEMODULE)))`
`2`	`4`	`USEPKG += libschc`
`3`	`5`	`endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+FEATURES_REQUIRED += float_math`
	`2`	`+`
`1`	`3`	`USEMODULE += lvgl`
`2`	`4`	`USEMODULE += lvgl_core`
`3`	`5`	`USEMODULE += lvgl_draw`