Skip to content

Fix minor issues for latest toolchains and future Dockerfile update #3367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Jan 23, 2026
+22 −9
Merged

Fix minor issues for latest toolchains and future Dockerfile update #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crypto/mbedtls/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ MBEDTLS_FRAMEWORK_UNPACKNAME = mbedtls-framework
CFLAGS += ${DEFINE_PREFIX}unix

mbedtls/library/bignum.c_CFLAGS += -fno-lto
mbedtls/library/ctr_drbg.c_CFLAGS += -Wno-array-bounds

# Build break on Assemble compiler if -fno-omit-frame-pointer and -O3 enabled at same time
# {standard input}: Assembler messages:
Expand Down
2 changes: 2 additions & 0 deletions interpreters/quickjs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ VERSION=\"$(QUICKJS_VERSION)\"
CFLAGS += -Dmp_add=qjs_mp_add -Dmp_sub=qjs_mp_sub -Dmp_mul=qjs_mp_mul
CFLAGS += -DCONFIG_VERSION=$(VERSION) -Wno-shadow
CFLAGS += -Wno-array-bounds -I$(QUICKJS_UNPACK)
CFLAGS += -Wno-strict-prototypes -Wno-unused-variable
CFLAGS += -Wno-unused-but-set-variable
CFLAGS += -D__linux__ -include alloca.h
CFLAGS += -Wno-incompatible-pointer-types
CFLAGS += -Wno-implicit-function-declaration
Expand Down
6 changes: 3 additions & 3 deletions lte/alt1250/alt1250_devif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ int altdevice_send_command(FAR struct alt1250_s *dev, int fd,
}
else
{
/* In case of send successed */
/* In case of send succeeded */

ret = container->outparam ? REP_NO_ACK_WOFREE : REP_NO_ACK;
}
Expand Down Expand Up @@ -173,7 +173,7 @@ int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffer)
****************************************************************************/

int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
FAR struct alt_container_s **replys)
FAR struct alt_container_s **replies)
{
int ret = -EIO;
struct alt_readdata_s dat;
Expand All @@ -183,7 +183,7 @@ int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
{
ret = OK;
*evtbitmap = dat.evtbitmap;
*replys = dat.head;
*replies = dat.head;
}

return ret;
Expand Down
4 changes: 2 additions & 2 deletions lte/alt1250/alt1250_devif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
****************************************************************************/

#ifndef __APSS_LTE_ALT1250_ALT1250_DEVIF_H
#ifndef __APPS_LTE_ALT1250_ALT1250_DEVIF_H
#define __APPS_LTE_ALT1250_ALT1250_DEVIF_H

/****************************************************************************
Expand Down Expand Up @@ -48,7 +48,7 @@ int altdevice_send_command(FAR struct alt1250_s *dev, int fd,
int altdevice_powercontrol(int fd, uint32_t cmd);
int altdevice_seteventbuff(int fd, FAR struct alt_evtbuffer_s *buffers);
int altdevice_getevent(int fd, FAR uint64_t *evtbitmap,
FAR struct alt_container_s **replys);
FAR struct alt_container_s **replies);
void altdevice_reset(int fd);
#ifdef CONFIG_LTE_ALT1250_ENABLE_HIBERNATION_MODE
int altdevice_powerresponse(int fd, uint32_t cmd, int resp);
Expand Down
16 changes: 12 additions & 4 deletions system/dd/dd_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,18 @@
#define CONFIG_SYSTEM_DD_PROGNAME "dd"
#endif
#if !defined(__NuttX__)
#define FAR
#define NSEC_PER_USEC 1000
#define USEC_PER_SEC 1000000
#define NSEC_PER_SEC 1000000000
# ifndef FAR
# define FAR
# endif
# ifndef NSEC_PER_USEC
# define NSEC_PER_USEC 1000
# endif
# ifndef USEC_PER_SEC
# define USEC_PER_SEC 1000000
# endif
# ifndef NSEC_PER_SEC
# define NSEC_PER_SEC 1000000000
# endif
#endif

#define g_dd CONFIG_SYSTEM_DD_PROGNAME
Expand Down
1 change: 1 addition & 0 deletions system/zlib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CSRCS += zlib/contrib/minizip/zip.c

CFLAGS += -Dunix -Wno-shadow -Wno-strict-prototypes -Wno-undef
CFLAGS += ${INCDIR_PREFIX}zlib
zlib/test/infcover.c_CFLAGS += -Wno-format

ZLIB_ZIP = zlib13.zip
ZLIB_SRC = zlib
Expand Down
1 change: 1 addition & 0 deletions testing/cxx/cxxtest/cxxtest_main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <nuttx/config.h>

#include <algorithm>
#include <cstdio>
#include <cassert>
#include <cstdio>
Expand Down
Loading