Merge pull request #896 from danc86/nodefaultlibs

soc/software: link with compiler instead of ld
This commit is contained in:
enjoy-digital 2021-04-28 15:44:49 +02:00 committed by GitHub
commit da1092d9c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ bios.elf: $(BIOS_DIRECTORY)/linker.ld $(OBJECTS)
../libfatfs/libfatfs.a \ ../libfatfs/libfatfs.a \
../liblitesdcard/liblitesdcard.a \ ../liblitesdcard/liblitesdcard.a \
../liblitesata/liblitesata.a ../liblitesata/liblitesata.a
$(LD) $(LDFLAGS) -T $(BIOS_DIRECTORY)/linker.ld -N -o $@ \ $(CC) $(LDFLAGS) -T $(BIOS_DIRECTORY)/linker.ld -N -o $@ \
../libbase/crt0.o \ ../libbase/crt0.o \
$(OBJECTS) \ $(OBJECTS) \
-L../libcompiler_rt \ -L../libcompiler_rt \

View File

@ -18,7 +18,7 @@ all: demo.bin
chmod -x $@ chmod -x $@
demo.elf: $(OBJECTS) demo.elf: $(OBJECTS)
$(LD) $(LDFLAGS) \ $(CC) $(LDFLAGS) \
-T linker.ld \ -T linker.ld \
-N -o $@ \ -N -o $@ \
$(BUILD_DIR)/software/libbase/crt0.o \ $(BUILD_DIR)/software/libbase/crt0.o \