diff --git a/Makefile b/Makefile index b13232e9..f1ab10e0 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,9 @@ all: - $(MAKE) -C crt0/ $(MAKE) -C nx/ install: $(MAKE) -C buildscripts/ install - $(MAKE) -C crt0/ install $(MAKE) -C nx/ install clean: - $(MAKE) -C crt0/ clean $(MAKE) -C nx/ clean diff --git a/buildscripts/lib/switch.specs b/buildscripts/lib/switch.specs index 5fa72298..914f97a0 100644 --- a/buildscripts/lib/switch.specs +++ b/buildscripts/lib/switch.specs @@ -4,5 +4,5 @@ %(old_link) -T switch.ld%s -pie --gc-sections -z text -z nodynamic-undefined-weak *startfile: -switch_crt0%O%s crti%O%s crtbegin%O%s +crti%O%s crtbegin%O%s diff --git a/crt0/Makefile b/crt0/Makefile deleted file mode 100644 index fdd5fc3c..00000000 --- a/crt0/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -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/pic/$^ - -clean: - rm -f switch_crt0.o diff --git a/crt0/switch_crt0.s b/nx/source/runtime/switch_crt0.s similarity index 100% rename from crt0/switch_crt0.s rename to nx/source/runtime/switch_crt0.s