Skip to content

Commit eafb127

Browse files
mark9064mark9064
committed
Implement required stubs instead of linking nosys
1 parent 088ce95 commit eafb127

File tree

2 files changed

+64
-7
lines changed

2 files changed

+64
-7
lines changed

‎src/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ target_compile_options(${EXECUTABLE_NAME} PUBLIC
930930

931931
set_target_properties(${EXECUTABLE_NAME} PROPERTIES
932932
SUFFIX ".out"
933-
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_FILE_NAME}.map"
933+
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_FILE_NAME}.map"
934934
)
935935

936936
add_custom_command(TARGET ${EXECUTABLE_NAME}
@@ -965,7 +965,7 @@ target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
965965

966966
set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES
967967
SUFFIX ".out"
968-
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_MCUBOOT_FILE_NAME}.map"
968+
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_MCUBOOT_FILE_NAME}.map"
969969
)
970970

971971
add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_NAME}
@@ -1008,7 +1008,7 @@ target_compile_options(${EXECUTABLE_RECOVERY_NAME} PUBLIC
10081008

10091009
set_target_properties(${EXECUTABLE_RECOVERY_NAME} PROPERTIES
10101010
SUFFIX ".out"
1011-
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_RECOVERY_FILE_NAME}.map"
1011+
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_RECOVERY_FILE_NAME}.map"
10121012
)
10131013

10141014
add_custom_command(TARGET ${EXECUTABLE_RECOVERY_NAME}
@@ -1040,7 +1040,7 @@ target_compile_options(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PUBLIC
10401040

10411041
set_target_properties(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PROPERTIES
10421042
SUFFIX ".out"
1043-
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
1043+
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
10441044
)
10451045

10461046
add_custom_command(TARGET ${EXECUTABLE_RECOVERY_MCUBOOT_NAME}
@@ -1083,7 +1083,7 @@ add_dependencies(${EXECUTABLE_RECOVERYLOADER_NAME} ${EXECUTABLE_RECOVERY_MCUBOOT
10831083

10841084
set_target_properties(${EXECUTABLE_RECOVERYLOADER_NAME} PROPERTIES
10851085
SUFFIX ".out"
1086-
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_RECOVERYLOADER_FILE_NAME}.map"
1086+
LINK_FLAGS "-mthumb -mabi=aapcs -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_RECOVERYLOADER_FILE_NAME}.map"
10871087
)
10881088

10891089
add_custom_command(TARGET ${EXECUTABLE_RECOVERYLOADER_NAME}
@@ -1118,7 +1118,7 @@ add_dependencies(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} ${EXECUTABLE_RECOVERY
11181118

11191119
set_target_properties(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} PROPERTIES
11201120
SUFFIX ".out"
1121-
LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} --specs=nosys.specs -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME}.map"
1121+
LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT_MCUBOOT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections -Wl,--print-memory-usage --specs=nano.specs -Wl,-Map=${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME}.map"
11221122
)
11231123

11241124
add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME}

‎src/stdlib.c‎

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <stdlib.h>
22
#include <string.h>
33
#include <FreeRTOS.h>
4+
#include <sys/stat.h>
5+
#include <unistd.h>
46

57
// Override malloc() and free() to use the memory manager from FreeRTOS.
68
// According to the documentation of libc, we also need to override
@@ -29,7 +31,7 @@ void __wrap_free(void* ptr) {
2931
}
3032

3133
void* calloc(size_t num, size_t size) {
32-
void *ptr = malloc(num * size);
34+
void* ptr = malloc(num * size);
3335
if (ptr) {
3436
memset(ptr, 0, num * size);
3537
}
@@ -49,3 +51,58 @@ void* realloc(void* ptr, size_t newSize) {
4951
void* __wrap_realloc(void* ptr, size_t newSize) {
5052
return realloc(ptr, newSize);
5153
}
54+
55+
// Implement functions required by libc as stubs
56+
// These functions aren't linked into the final binary
57+
58+
__attribute__((error("stub"))) void _close(int fp) {
59+
__builtin_trap();
60+
(void) fp;
61+
}
62+
63+
__attribute__((error("stub"))) void _fstat(int fildes, struct stat* buf) {
64+
__builtin_trap();
65+
(void) fildes;
66+
(void) buf;
67+
}
68+
69+
__attribute__((error("stub"))) pid_t _getpid() {
70+
__builtin_trap();
71+
}
72+
73+
__attribute__((error("stub"))) int _isatty(int fd) {
74+
__builtin_trap();
75+
(void) fd;
76+
}
77+
78+
__attribute__((error("stub"))) int _kill(pid_t pid, int sig) {
79+
__builtin_trap();
80+
(void) pid;
81+
(void) sig;
82+
}
83+
84+
__attribute__((error("stub"))) off_t _lseek(int fd, off_t offset, int whence) {
85+
__builtin_trap();
86+
(void) fd;
87+
(void) offset;
88+
(void) whence;
89+
}
90+
91+
__attribute__((error("stub"))) ssize_t _read(int fd, void* buf, size_t count) {
92+
__builtin_trap();
93+
(void) fd;
94+
(void) buf;
95+
(void) count;
96+
}
97+
98+
__attribute__((error("stub"))) ssize_t _write(int fd, void* buf, size_t count) {
99+
__builtin_trap();
100+
(void) fd;
101+
(void) buf;
102+
(void) count;
103+
}
104+
105+
__attribute__((error("stub"))) void _exit(int status) {
106+
__builtin_trap();
107+
(void) status;
108+
}

0 commit comments

Comments
 (0)