From 5c5fb1493ebce134ea18d28a302a5efb8f46abb8 Mon Sep 17 00:00:00 2001 From: isometimes Date: Fri, 27 Aug 2021 11:56:23 +0100 Subject: [PATCH] Fixed nostartfiles issue with Makefile.gcc* as ld no longer ignores erroneous arguments --- part10-multicore/Makefile.gcc | 4 ++-- part2-building/Makefile.gcc | 4 ++-- part2-building/README.md | 4 ++-- part3-helloworld/Makefile.gcc | 4 ++-- part4-miniuart/Makefile.gcc | 4 ++-- part5-framebuffer/Makefile.gcc | 4 ++-- part6-breakout/Makefile.gcc | 4 ++-- part7-bluetooth/Makefile.gcc | 4 ++-- part8-breakout-ble/Makefile.gcc | 4 ++-- part8-breakout-ble/Makefile.gcc.windows | 2 +- part9-sound/Makefile.gcc | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/part10-multicore/Makefile.gcc b/part10-multicore/Makefile.gcc index d5cc1f5..9fe0560 100644 --- a/part10-multicore/Makefile.gcc +++ b/part10-multicore/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -15,7 +15,7 @@ audio.o : audio.bin $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) audio.o - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) audio.o -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) audio.o -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part2-building/Makefile.gcc b/part2-building/Makefile.gcc index 89235e9..ae02b77 100644 --- a/part2-building/Makefile.gcc +++ b/part2-building/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -12,7 +12,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part2-building/README.md b/part2-building/README.md index 1d4e40d..ccf9986 100644 --- a/part2-building/README.md +++ b/part2-building/README.md @@ -12,7 +12,7 @@ If you're using Arm gcc on Linux, save the following as _Makefile_ (in the repo CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -23,7 +23,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part3-helloworld/Makefile.gcc b/part3-helloworld/Makefile.gcc index 89235e9..ae02b77 100644 --- a/part3-helloworld/Makefile.gcc +++ b/part3-helloworld/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -12,7 +12,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part4-miniuart/Makefile.gcc b/part4-miniuart/Makefile.gcc index 89235e9..ae02b77 100644 --- a/part4-miniuart/Makefile.gcc +++ b/part4-miniuart/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -12,7 +12,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part5-framebuffer/Makefile.gcc b/part5-framebuffer/Makefile.gcc index 89235e9..ae02b77 100644 --- a/part5-framebuffer/Makefile.gcc +++ b/part5-framebuffer/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -12,7 +12,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part6-breakout/Makefile.gcc b/part6-breakout/Makefile.gcc index 89235e9..ae02b77 100644 --- a/part6-breakout/Makefile.gcc +++ b/part6-breakout/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -12,7 +12,7 @@ boot.o: boot.S $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part7-bluetooth/Makefile.gcc b/part7-bluetooth/Makefile.gcc index 3ecc081..a22d069 100644 --- a/part7-bluetooth/Makefile.gcc +++ b/part7-bluetooth/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -15,7 +15,7 @@ BCM4345C0.o : BCM4345C0.hcd $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) BCM4345C0.o - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part8-breakout-ble/Makefile.gcc b/part8-breakout-ble/Makefile.gcc index 3ecc081..a22d069 100644 --- a/part8-breakout-ble/Makefile.gcc +++ b/part8-breakout-ble/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -15,7 +15,7 @@ BCM4345C0.o : BCM4345C0.hcd $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) BCM4345C0.o - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part8-breakout-ble/Makefile.gcc.windows b/part8-breakout-ble/Makefile.gcc.windows index 349a29b..ac37e4a 100644 --- a/part8-breakout-ble/Makefile.gcc.windows +++ b/part8-breakout-ble/Makefile.gcc.windows @@ -15,7 +15,7 @@ BCM4345C0.o : BCM4345C0.hcd $(GCCPATH)\aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) BCM4345C0.o - $(GCCPATH)\aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf + $(GCCPATH)\aarch64-none-elf-ld -nostdlib boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf $(GCCPATH)\aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: diff --git a/part9-sound/Makefile.gcc b/part9-sound/Makefile.gcc index d5cc1f5..9fe0560 100644 --- a/part9-sound/Makefile.gcc +++ b/part9-sound/Makefile.gcc @@ -1,7 +1,7 @@ CFILES = $(wildcard *.c) OFILES = $(CFILES:.c=.o) GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -GCCPATH = ../../gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin +GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin all: clean kernel8.img @@ -15,7 +15,7 @@ audio.o : audio.bin $(GCCPATH)/aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@ kernel8.img: boot.o $(OFILES) audio.o - $(GCCPATH)/aarch64-none-elf-ld -nostdlib -nostartfiles boot.o $(OFILES) audio.o -T link.ld -o kernel8.elf + $(GCCPATH)/aarch64-none-elf-ld -nostdlib boot.o $(OFILES) audio.o -T link.ld -o kernel8.elf $(GCCPATH)/aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img clean: