github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

umm: restore -fno-common to avoid overlap between ummHeapInfo and umm_heap, see also 3a39a9b64e

Browse source
This commit is contained in:
Philippe Teuwen 2020-09-01 01:53:24 +02:00
commit d97e14f5c9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/Makefile
View file

@ -20,7 +20,7 @@ endif
#in the next section to remove that particular feature from compilation. #in the next section to remove that particular feature from compilation.
# NO space,TABs after the "\" sign. # NO space,TABs after the "\" sign.
APP_CFLAGS = $(PLATFORM_DEFS) \ APP_CFLAGS = $(PLATFORM_DEFS) \
-ffunction-sections -fdata-sections -ffunction-sections -fdata-sections -fno-common
SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c lfadc.c SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c lfadc.c
SRC_ISO15693 = iso15693.c iso15693tools.c SRC_ISO15693 = iso15693.c iso15693tools.c

3
armsrc/appmain.c
View file

@ -83,8 +83,9 @@ static void umm_test(void) {
umm_info(NULL, true); umm_info(NULL, true);
uint8_t* dest = (uint8_t*)umm_malloc(2000); uint8_t* dest = (uint8_t*)umm_malloc(2000);
umm_free(dest); umm_free(dest);
umm_info(NULL, true);
dest = (uint8_t*)umm_malloc(12000); dest = (uint8_t*)umm_malloc(12000);
umm_info(dest, true); umm_info(NULL, true);
umm_free(dest); umm_free(dest);
} }