mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-14 02:26:59 -07:00
Link using gcc and get rid of the LIBGCC stuff
GCC knows how to find libgcc, and the proper way to link C code is to use gcc, not ld.
This commit is contained in:
parent
b7913d8f4b
commit
98540684df
2 changed files with 4 additions and 6 deletions
|
@ -49,8 +49,8 @@ all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
|
|||
$(OBJDIR)/fpga.o: fpga.bit
|
||||
$(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit $^ $@
|
||||
|
||||
$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(LIBGCC)
|
||||
$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
|
||||
$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ)
|
||||
$(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
|
||||
|
||||
$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
|
||||
$(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@
|
||||
|
|
|
@ -40,9 +40,6 @@ COPY=cp
|
|||
PATHSEP=/
|
||||
FLASH_TOOL=client/flasher
|
||||
DETECTED_OS=UNAME
|
||||
# You may/should set this in your environment
|
||||
LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
|
||||
PATH := $(PATH):$(DEVKITARM)/bin
|
||||
|
||||
else
|
||||
|
||||
|
@ -51,7 +48,6 @@ DELETE=del /q
|
|||
MOVE=ren
|
||||
COPY=copy
|
||||
PATHSEP=\\#
|
||||
LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
|
||||
FLASH_TOOL=winsrc\\prox.exe
|
||||
DETECTED_OS=Windows
|
||||
|
||||
|
@ -64,6 +60,8 @@ VPATH = . ../common/ ../fpga/
|
|||
INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
|
||||
|
||||
CFLAGS = -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
|
||||
LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
|
||||
LIBS = -lgcc
|
||||
|
||||
THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
|
||||
ARMOBJ = $(ARMSRC:%.c=$(OBJDIR)/%.o)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue