Rename MG_ARCH_NEWLIB -> MG_ARCH_ARM_GCC

This commit is contained in:
Sergey Lyubka committed 2025-07-15 11:22:17 +01:00
1 parent 8bfd0c2ca3
commit 6c044d6aeb
36 files changed
+67 -63

No files matched your search

+27 -25
View File
@@ -35,7 +35,7 @@ extern "C" {
#define MG_ARCH_FREERTOS 5 // FreeRTOS
#define MG_ARCH_THREADX 6 // Eclipse ThreadX (former MS Azure RTOS)
#define MG_ARCH_ZEPHYR 7 // Zephyr RTOS
#define MG_ARCH_NEWLIB 8 // Bare metal ARM
#define MG_ARCH_ARMGCC 8 // Plain ARM GCC
#define MG_ARCH_CMSIS_RTOS1 9 // CMSIS-RTOS API v1 (Keil RTX)
#define MG_ARCH_TIRTOS 10 // Texas Semi TI-RTOS
#define MG_ARCH_PICOSDK 11 // Raspberry Pi Pico-SDK (RP2040, RP2350)
@@ -44,6 +44,8 @@ extern "C" {
#define MG_ARCH_RTTHREAD 14 // RT-Thread RTOS
#define MG_ARCH_ARMCGT 15 // Texas Semi ARM-CGT
#define MG_ARCH_NEWLIB MG_ARCH_ARMGCC // Alias, deprecate in 2025
#if !defined(MG_ARCH)
#if defined(__unix__) || defined(__APPLE__)
#define MG_ARCH MG_ARCH_UNIX
@@ -97,6 +99,29 @@ extern "C" {
#endif
#if MG_ARCH == MG_ARCH_ARMGCC
#define _POSIX_TIMERS
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#define MG_PATH_MAX 100
#define MG_ENABLE_SOCKET 0
#define MG_ENABLE_DIRLIST 0
#endif
#if MG_ARCH == MG_ARCH_ESP32
#include <ctype.h>
@@ -206,29 +231,6 @@ static inline int mg_mkdir(const char *path, mode_t mode) {
#endif // MG_ARCH == MG_ARCH_FREERTOS
#if MG_ARCH == MG_ARCH_NEWLIB
#define _POSIX_TIMERS
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#define MG_PATH_MAX 100
#define MG_ENABLE_SOCKET 0
#define MG_ENABLE_DIRLIST 0
#endif
#if MG_ARCH == MG_ARCH_PICOSDK
#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP
#include <errno.h>
@@ -622,8 +624,8 @@ typedef int socklen_t;
#if MG_ARCH == MG_ARCH_ZEPHYR
#include <zephyr/version.h>
#include <zephyr/kernel.h>
#include <zephyr/version.h>
#include <ctype.h>
#include <errno.h>
+4 -2
View File
@@ -8,7 +8,7 @@
#define MG_ARCH_FREERTOS 5 // FreeRTOS
#define MG_ARCH_THREADX 6 // Eclipse ThreadX (former MS Azure RTOS)
#define MG_ARCH_ZEPHYR 7 // Zephyr RTOS
#define MG_ARCH_NEWLIB 8 // Bare metal ARM
#define MG_ARCH_ARMGCC 8 // Plain ARM GCC
#define MG_ARCH_CMSIS_RTOS1 9 // CMSIS-RTOS API v1 (Keil RTX)
#define MG_ARCH_TIRTOS 10 // Texas Semi TI-RTOS
#define MG_ARCH_PICOSDK 11 // Raspberry Pi Pico-SDK (RP2040, RP2350)
@@ -17,6 +17,8 @@
#define MG_ARCH_RTTHREAD 14 // RT-Thread RTOS
#define MG_ARCH_ARMCGT 15 // Texas Semi ARM-CGT
#define MG_ARCH_NEWLIB MG_ARCH_ARMGCC // Alias, deprecate in 2025
#if !defined(MG_ARCH)
#if defined(__unix__) || defined(__APPLE__)
#define MG_ARCH MG_ARCH_UNIX
@@ -39,7 +41,7 @@
#include "arch_esp32.h"
#include "arch_esp8266.h"
#include "arch_freertos.h"
#include "arch_newlib.h"
#include "arch_armgcc.h"
#include "arch_rtx.h"
#include "arch_unix.h"
#include "arch_win32.h"
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#if MG_ARCH == MG_ARCH_NEWLIB
#if MG_ARCH == MG_ARCH_ARMGCC
#define _POSIX_TIMERS
#include <ctype.h>
+2 -2
View File
@@ -178,11 +178,11 @@ s390: CC = $(DOCKER) mdashnet/s390 cc
s390: RUN = $(DOCKER) mdashnet/s390
s390: test
arm: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ENABLE_TCPIP_DRIVER_INIT=0 -DMG_ARCH=MG_ARCH_NEWLIB -DNO_SLEEP_ABORT
arm: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ENABLE_TCPIP_DRIVER_INIT=0 -DMG_ARCH=MG_ARCH_ARMGCC -DNO_SLEEP_ABORT
arm: mongoose.h $(SRCS)
$(DOCKER) mdashnet/armgcc arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb $(SRCS) $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) -o unit_test -nostartfiles --specs nosys.specs -e 0
riscv: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ENABLE_TCPIP_DRIVER_INIT=0 -DMG_ARCH=MG_ARCH_NEWLIB -DNO_SLEEP_ABORT
riscv: DEFS += -DMG_ENABLE_POSIX_FS=0 -DMG_ENABLE_TCPIP=1 -DMG_ENABLE_TCPIP_DRIVER_INIT=0 -DMG_ARCH=MG_ARCH_ARMGCC -DNO_SLEEP_ABORT
riscv: mongoose.h $(SRCS)
$(DOCKER) mdashnet/riscv riscv-none-elf-gcc -march=rv32imc -mabi=ilp32 $(SRCS) $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) -o unit_test
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
// Full list of options is at https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB // Build env: ARM GCC + Newlib C library
#define MG_ARCH MG_ARCH_ARMGCC // Build env: ARM GCC + Newlib C library
#define MG_TLS MG_TLS_BUILTIN // MG_TLS_NONE, MG_TLS_MBED, MG_TLS_OPENSSL, MG_TLS_CUSTOM
#define MG_ENABLE_TCPIP 1 // Enable built-in TCP/IP stack
+2 -2
View File
@@ -35,7 +35,7 @@ extern "C" {
#define MG_ARCH_FREERTOS 5 // FreeRTOS
#define MG_ARCH_AZURERTOS 6 // MS Azure RTOS
#define MG_ARCH_ZEPHYR 7 // Zephyr RTOS
#define MG_ARCH_NEWLIB 8 // Bare metal ARM
#define MG_ARCH_ARMGCC 8 // Bare metal ARM
#define MG_ARCH_CMSIS_RTOS1 9 // CMSIS-RTOS API v1 (Keil RTX)
#define MG_ARCH_TIRTOS 10 // Texas Semi TI-RTOS
#define MG_ARCH_PICOSDK 11 // Raspberry Pi Pico-SDK (RP2040, RP2350)
@@ -220,7 +220,7 @@ static inline int mg_mkdir(const char *path, mode_t mode) {
#endif // MG_ARCH == MG_ARCH_FREERTOS
#if MG_ARCH == MG_ARCH_NEWLIB
#if MG_ARCH == MG_ARCH_ARMGCC
#define _POSIX_TIMERS
#include <ctype.h>
@@ -10,7 +10,7 @@ SOURCES = main.c syscalls.c startup.c
# Mongoose-specific source code files and build options. See https://mongoose.ws/documentation/#build-options
SOURCES += mongoose.c net.c packed_fs.c
CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB -DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1
CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_ARMGCC -DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1
CFLAGS += -DMG_ENABLE_DRIVER_SAME54=1 -DMG_ENABLE_CUSTOM_RANDOM=1 -DMG_ENABLE_PACKED_FS=1 $(CFLAGS_EXTRA)
# Example specific build options. See README.md
@@ -1,6 +1,6 @@
#pragma once
#define MG_ARCH MG_ARCH_NEWLIB // Use ARM toolchain
#define MG_ARCH MG_ARCH_ARMGCC // Use ARM toolchain
#define MG_ENABLE_TCPIP 1 // Enable built-in network stack
#define MG_ENABLE_DRIVER_IMXRT10 1 // Enable RTxx driver
#define MG_ENABLE_CUSTOM_MILLIS 1 // Let user implement mg_millis()
@@ -10,7 +10,7 @@ SOURCES = main.c syscalls.c startup.c
# Mongoose-specific source code files and build options. See https://mongoose.ws/documentation/#build-options
SOURCES += mongoose.c
CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_NEWLIB -DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1
CFLAGS += -DMG_ENABLE_TCPIP=1 -DMG_ARCH=MG_ARCH_ARMGCC -DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_LINES=1
CFLAGS += -DMG_ENABLE_DRIVER_SAME54=1 -DMG_ENABLE_CUSTOM_RANDOM=1 -DMG_ENABLE_PACKED_FS=1 $(CFLAGS_EXTRA)
# Example specific build options. See README.md
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_DRIVER_IMXRT10 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -4,7 +4,7 @@
#define MG_STMPACK_ARCH MG_ARCH
#undef MG_ARCH
#elif defined(__GNUC__)
#define MG_STMPACK_ARCH MG_ARCH_NEWLIB
#define MG_STMPACK_ARCH MG_ARCH_ARMGCC
#endif
#define MG_ENABLE_PACKED_FS 1
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_ARMCC
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_FREERTOS
// <q> Enable builtin TCP/IP stack
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -4,7 +4,7 @@
#define MG_STMPACK_ARCH MG_ARCH
#undef MG_ARCH
#elif defined(__GNUC__)
#define MG_STMPACK_ARCH MG_ARCH_NEWLIB
#define MG_STMPACK_ARCH MG_ARCH_ARMGCC
#endif
#define MG_ENABLE_PACKED_FS 1
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_ARMCC
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_FREERTOS
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_FREERTOS
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_FREERTOS
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS2
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS2
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS1
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS1
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS2
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS2
// <q> Enable builtin TCP/IP stack
@@ -8,7 +8,7 @@
// <MG_ARCH_FREERTOS=> FreeRTOS
// <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
// <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
// <MG_ARCH_NEWLIB=> ARM GCC + Newlib
// <MG_ARCH_ARMGCC=> ARM GCC + Newlib
#define MG_ARCH MG_ARCH_CMSIS_RTOS2
// <q> Enable builtin TCP/IP stack
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_DRIVER_W5500 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_TLS MG_TLS_BUILTIN
#define MG_OTA MG_OTA_STM32H7_DUAL_CORE
#define MG_IRAM __attribute__((section(".RamFunc")))
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_TLS MG_TLS_BUILTIN
#define MG_OTA MG_OTA_STM32H7_DUAL_CORE
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_ENABLE_TCPIP 1
#define MG_ENABLE_CUSTOM_MILLIS 1
@@ -1,7 +1,7 @@
#pragma once
// See https://mongoose.ws/documentation/#build-options
#define MG_ARCH MG_ARCH_NEWLIB
#define MG_ARCH MG_ARCH_ARMGCC
#define MG_OTA MG_OTA_CH32V307
#define MG_ENABLE_TCPIP 1