mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
pkg: 64 bit compatibility
* Added arch_64bit feature and added it to all packages that require 32 bit. * hacl, wolfssl: Fixed different types between function declaration and implementation. * lwip: Add required flag for 64 bit and bug fix in `lwip_sock`. * micro-ecc: Workaround for GCC warning when using `__int128`.
This commit is contained in:
parent
0cffb7f365
commit
3291f94e07
@ -22,6 +22,11 @@ config HAS_ARCH_32BIT
|
||||
help
|
||||
Indicates that the CPU has a 32-bits architecture.
|
||||
|
||||
config HAS_ARCH_64BIT
|
||||
bool
|
||||
help
|
||||
Indicates that the CPU has a 64-bits architecture.
|
||||
|
||||
config HAS_ARCH_ARM
|
||||
bool
|
||||
help
|
||||
|
@ -8,7 +8,7 @@
|
||||
config PACKAGE_CIFRA
|
||||
bool "Cifra cryptographic primitives"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
help
|
||||
Cifra is a collection of cryptographic primitives targeted at
|
||||
embedded use.
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Cifra is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -8,7 +8,7 @@
|
||||
config PACKAGE_CN-CBOR
|
||||
bool "Constrained Node CBOR"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
select MODULE_POSIX_HEADERS
|
||||
help
|
||||
A constrained node implementation of CBOR in C.
|
||||
|
@ -1,4 +1,4 @@
|
||||
USEMODULE += posix_headers
|
||||
|
||||
# CN-CBOR is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -1,5 +1,5 @@
|
||||
# FlashDB is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
CFLAGS += -DFDB_USING_NATIVE_ASSERT
|
||||
|
||||
ifneq (,$(filter flashdb_tsdb,$(USEMODULE)))
|
||||
|
@ -9,4 +9,4 @@ config PACKAGE_HACL
|
||||
bool "High Assurance Cryptographic Library package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on MODULE_RANDOM
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
@ -1,4 +1,4 @@
|
||||
USEMODULE+=random
|
||||
|
||||
# HACL is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
BIN
pkg/hacl/patches/0003-64-bit-fix.patch
Normal file
BIN
pkg/hacl/patches/0003-64-bit-fix.patch
Normal file
Binary file not shown.
@ -8,7 +8,7 @@
|
||||
config PACKAGE_JERRYSCRIPT
|
||||
bool "Ultra-lightweight Javascript interpreter"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
||||
select MODULE_JERRYSCRIPT-PORT-DEFAULT
|
||||
select MODULE_JERRYSCRIPT-EXT
|
||||
|
@ -2,4 +2,4 @@ USEMODULE += jerryscript-port-default
|
||||
USEMODULE += jerryscript-ext
|
||||
|
||||
# Jerryscript is only supported by 32-bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -9,4 +9,4 @@ config PACKAGE_LIBHYDROGEN
|
||||
bool "LibHydrogen Crypto Library package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on MODULE_RANDOM
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
@ -3,4 +3,4 @@ USEMODULE += random
|
||||
# libhydrogen is only supported by 32 bit architectures
|
||||
# AVR boards: require avr-gcc >= 7.0 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040)
|
||||
# MSP430 boards: invalid alignment of 'hydro_random_context'
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -7,5 +7,5 @@ ifneq (,$(filter lorabasics_sx1280_driver,$(USEMODULE)))
|
||||
USEMODULE += lorabasics_driver_sx1280_hal
|
||||
endif
|
||||
# This package has assumptions that only work for 32-bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
USEMODULE += lorabasics_smtc_ral
|
||||
|
@ -8,7 +8,7 @@
|
||||
config PACKAGE_LUA
|
||||
bool "LUA language package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
depends on !HAS_ARCH_RISCV
|
||||
depends on !MODULE_PICOLIBC
|
||||
|
||||
|
@ -3,7 +3,7 @@ USEMODULE += lua-contrib
|
||||
USEMODULE += printf_float
|
||||
|
||||
# LUA is only supported by 32-bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
||||
# LUA is not supported on RISCV because of build issues with the toolchain
|
||||
# (undefined reference to _times, _unlink and _link functions in provided
|
||||
|
@ -1,6 +1,6 @@
|
||||
# lwIP's memory management doesn't seem to work on non 32-bit platforms at the
|
||||
# moment.
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
||||
DEFAULT_MODULE += auto_init_lwip
|
||||
|
||||
|
@ -17,6 +17,11 @@ PSEUDOMODULES += lwip_udp
|
||||
PSEUDOMODULES += lwip_udplite
|
||||
PSEUDOMODULES += lwip_sock_async
|
||||
|
||||
ifneq (,$(filter arch_64bit,$(FEATURES_USED)))
|
||||
# Required for platforms where sizeof(void*) > 4
|
||||
CFLAGS += -DIPV6_FRAG_COPYHEADER=1
|
||||
endif
|
||||
|
||||
ifneq (,$(filter lwip_contrib,$(USEMODULE)))
|
||||
DIRS += $(RIOTBASE)/pkg/lwip/contrib
|
||||
endif
|
||||
|
@ -616,7 +616,7 @@ ssize_t lwip_sock_sendv(struct netconn *conn, const iolist_t *snips,
|
||||
struct netconn *tmp;
|
||||
struct netbuf *buf = NULL;
|
||||
size_t payload_len = 0;
|
||||
int res;
|
||||
ssize_t res;
|
||||
err_t err= ERR_OK;
|
||||
u16_t remote_port = 0;
|
||||
|
||||
|
BIN
pkg/micro-ecc/patches/0001-int128-fix-for-GCC.patch
Normal file
BIN
pkg/micro-ecc/patches/0001-int128-fix-for-GCC.patch
Normal file
Binary file not shown.
@ -8,7 +8,7 @@
|
||||
config PACKAGE_MONOCYPHER
|
||||
bool "Monocypher high performance cryptographic library package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
select MODULE_MONOCYPHER_OPTIONAL
|
||||
help
|
||||
Provides functions for authenticated encryption, hashing,
|
||||
|
@ -2,4 +2,4 @@
|
||||
USEMODULE += monocypher_optional
|
||||
|
||||
# monocypher is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -8,4 +8,4 @@
|
||||
config PACKAGE_QCBOR
|
||||
bool "QCBOR CBOR encoder/decoder"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
@ -1 +1 @@
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -8,7 +8,7 @@
|
||||
menuconfig PACKAGE_TINYCBOR
|
||||
bool "Tiny CBOR encode/decoder package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
help
|
||||
TinyCBOR is a CBOR encoder and decoder with a very small
|
||||
footprint, optimized for very fast operation.
|
||||
|
@ -1,2 +1,2 @@
|
||||
# tinycbor is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -8,4 +8,4 @@
|
||||
config PACKAGE_TINYCRYPT
|
||||
bool "TinyCrypt crypto library package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
@ -1 +1 @@
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -32,7 +32,7 @@ choice USB_IMPLEMENTATION
|
||||
menuconfig PACKAGE_TINYUSB
|
||||
bool "TinyUSB stack package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
depends on HAS_TINYUSB_DEVICE || HAS_TINYUSB_HOST
|
||||
select MODULE_FMT
|
||||
select MODULE_LUID
|
||||
|
@ -8,7 +8,7 @@
|
||||
menuconfig PACKAGE_TLSF
|
||||
bool "TLFS malloc/realloc/free/etc package"
|
||||
depends on TEST_KCONFIG
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
help
|
||||
TLSF provides an implementation of malloc/realloc/free/etc.
|
||||
|
||||
|
@ -9,4 +9,4 @@ ifneq (,$(filter tlsf-malloc,$(USEMODULE)))
|
||||
endif
|
||||
|
||||
# tlsf is not compatible with 8bit and 16bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -14,7 +14,7 @@ menuconfig PACKAGE_UWB-DW1000
|
||||
select MODULE_PERIPH_GPIO_IRQ
|
||||
depends on HAS_PERIPH_SPI
|
||||
select MODULE_PERIPH_SPI
|
||||
depends on HAS_ARCH_32BIT
|
||||
depends on HAS_ARCH_32BIT || HAS_ARCH_64BIT
|
||||
|
||||
if PACKAGE_UWB-DW1000
|
||||
|
||||
|
@ -7,4 +7,4 @@ FEATURES_REQUIRED += periph_gpio_irq
|
||||
FEATURES_REQUIRED += periph_spi
|
||||
|
||||
# Some of the pkg operation would overflow on 16bit
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -91,4 +91,4 @@ ifneq (,$(filter native,$(CPU)))
|
||||
endif
|
||||
|
||||
# wolfssl is only supported by 32 bit architectures
|
||||
FEATURES_REQUIRED += arch_32bit
|
||||
FEATURES_REQUIRED_ANY += arch_32bit|arch_64bit
|
||||
|
@ -73,7 +73,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
/* defined somewhere else */
|
||||
int strncasecmp(const char *s1, const char * s2, unsigned int sz);
|
||||
int strncasecmp(const char *s1, const char * s2, size_t sz);
|
||||
|
||||
#define SINGLE_THREADED
|
||||
|
||||
|
@ -85,7 +85,7 @@ void sock_dtls_session_destroy(sock_tls_t *sk)
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
int strncasecmp(const char *s1, const char * s2, unsigned int sz)
|
||||
int strncasecmp(const char *s1, const char * s2, size_t sz)
|
||||
{
|
||||
unsigned int i;
|
||||
for( i = 0; i < sz; i++) {
|
||||
|
Loading…
Reference in New Issue
Block a user