From 1f1405da759bf2382b7557e0285bb8a1626d7afd Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Sep 2017 19:23:36 +0100 Subject: [PATCH 1/6] use devkitA64 path --- buildscripts/base_tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/base_tools b/buildscripts/base_tools index f0864823..d322ce3a 100644 --- a/buildscripts/base_tools +++ b/buildscripts/base_tools @@ -10,7 +10,7 @@ endif #--------------------------------------------------------------------------------- # path to tools #--------------------------------------------------------------------------------- -export PATH := $(DEVKITARM)/bin:$(PATH) +export PATH := $(DEVKITA64)/bin:$(PATH) #--------------------------------------------------------------------------------- # the prefix on the compiler executables From 5d2dc55b933bf3b046f86e59ddd8f8a4e3fbfbc4 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Sep 2017 19:25:15 +0100 Subject: [PATCH 2/6] allow CFLAGS override --- tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 0479b49e..7f550052 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,10 @@ all: elf2nso build_pfs0 build_pfs0: build_pfs0.c - gcc -o $@ $^ + gcc $(CFLAGS) -o $@ $^ elf2nso: elf2nso.c sha256.c - gcc -o $@ $^ -llz4 + gcc $(CFLAGS) -o $@ $^ -llz4 install: all cp build_pfs0 /usr/local/bin/ From dabcbd87026553c9d4d160fcd9b3adf3d3aa2268 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Sep 2017 19:25:42 +0100 Subject: [PATCH 3/6] copy tools to devkitA64 --- tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 7f550052..66745fd5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -7,8 +7,8 @@ elf2nso: elf2nso.c sha256.c gcc $(CFLAGS) -o $@ $^ -llz4 install: all - cp build_pfs0 /usr/local/bin/ - cp elf2nso /usr/local/bin/ + cp build_pfs0 $(DEVKITA64)/bin/ + cp elf2nso $(DEVKITA64)/bin/ clean: rm -f elf2nso From a8c9b1e79464198316c68ee032156a5f97f4f50d Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Sep 2017 19:40:15 +0100 Subject: [PATCH 4/6] ignore generated files --- .gitignore | 3 +++ nx/.gitignore | 4 ++++ tools/.gitignore | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 .gitignore create mode 100644 nx/.gitignore create mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..7c41a47b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.o +*.bz2 + diff --git a/nx/.gitignore b/nx/.gitignore new file mode 100644 index 00000000..356ccb11 --- /dev/null +++ b/nx/.gitignore @@ -0,0 +1,4 @@ +debug +release +lib + diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..7b071a86 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,2 @@ +build_pfs0 +elf2nso From 98a82d71be8e543cc982de8006b24c5092a785f5 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 18 Sep 2017 19:40:40 +0100 Subject: [PATCH 5/6] use full path to gcc --- crt0/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt0/Makefile b/crt0/Makefile index 0cc5e8f8..95117cd9 100644 --- a/crt0/Makefile +++ b/crt0/Makefile @@ -1,5 +1,5 @@ switch_crt0.o: *.s - aarch64-none-elf-gcc -march=armv8-a -x assembler-with-cpp -c $^ -o $@ + $(DEVKITA64)/bin/aarch64-none-elf-gcc -march=armv8-a -x assembler-with-cpp -c $^ -o $@ install: switch_crt0.o cp $^ $(DEVKITA64)/aarch64-none-elf/lib/$^ From 090744f0f416840796d968662ccb883b3e5b64f0 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Tue, 19 Sep 2017 01:12:06 +0100 Subject: [PATCH 6/6] switch crt0 to pic multilib --- crt0/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt0/Makefile b/crt0/Makefile index 95117cd9..fdd5fc3c 100644 --- a/crt0/Makefile +++ b/crt0/Makefile @@ -2,7 +2,7 @@ switch_crt0.o: *.s $(DEVKITA64)/bin/aarch64-none-elf-gcc -march=armv8-a -x assembler-with-cpp -c $^ -o $@ install: switch_crt0.o - cp $^ $(DEVKITA64)/aarch64-none-elf/lib/$^ + cp $^ $(DEVKITA64)/aarch64-none-elf/lib/pic/$^ clean: rm -f switch_crt0.o