:: commit 3e4b9c11b8a52cb38444db53372b029fc467cdd4

mintsuki <mintsuki@protonmail.com> — 2024-08-10 09:41

parents: cf501adb63

build: bootstrap: Update cc-runtime

diff --git a/.gitignore b/.gitignore
index dbfcc21e..27ac64c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,9 +30,9 @@
 /common/libfdt
 /common/lib/stb_image.h.nopatch
 /common/lib/stb_image.h
-/common/cc-runtime
+/common/cc-runtime.s2.c
 /decompressor/tinf
-/decompressor/cc-runtime
+/decompressor/cc-runtime.c
 /dtc
 /tinf
 /ovmf*
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 64988416..f7358c72 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -326,8 +326,6 @@ dist:
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/flanterm/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/flanterm/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding-headers/.git"
-	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/cc-runtime/.git"
-	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/decompressor/cc-runtime/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/dtc"
@@ -359,7 +357,7 @@ distclean: clean
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h.nopatch common/lib/stb_image.h decompressor/tinf tinf dtc freestanding-headers common/cc-runtime decompressor/cc-runtime limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h.nopatch common/lib/stb_image.h decompressor/tinf tinf dtc freestanding-headers common/cc-runtime.s2.c decompressor/cc-runtime.c limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
 
 .PHONY: common-uefi-x86-64
 common-uefi-x86-64:
diff --git a/bootstrap b/bootstrap
index db84e195..55187d3b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -65,15 +65,11 @@ if ! test -f version; then
         freestanding-headers \
         dd3abd2d7147efc4170dff478d3b7730bed14147
 
-    clone_repo_commit \
-        https://github.com/osdev0/cc-runtime.git \
-        decompressor/cc-runtime \
-        aa5854cebb4a5a561f35252cdda741919fc9c3f6
-    rm -rf common/cc-runtime
-    cp -rp decompressor/cc-runtime common/
-    for f in common/cc-runtime/*.c; do
-        mv "$f" "$(echo "$f" | sed 's/\.c/.s2.c/g')"
-    done
+    download_by_hash \
+        https://github.com/osdev0/cc-runtime/raw/dcdf5d82973e77edee597a047a3ef66300903de9/cc-runtime.c \
+        decompressor/cc-runtime.c \
+        199907f5303ab15a963377fabcc1f2ee736e4ed18d54c59aab08345aa5485e8a
+    cp decompressor/cc-runtime.c common/cc-runtime.s2.c
 
     download_by_hash \
         https://github.com/osdev0/freestanding-toolchain/raw/278277e9ade987528f95e011f233837a31233ff6/freestanding-toolchain \
tab: 248 wrap: offon