Skip to content

Commit cb46322

Browse files
MintsukiMintsuki
committed
misc: Update to latest, packed, cc-runtime
1 parent 7e84c1e commit cb46322

7 files changed

Lines changed: 21 additions & 57 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
/common/libfdt
3232
/common/lib/stb_image.h.nopatch
3333
/common/lib/stb_image.h
34+
/common/cc-runtime.s2.c
3435
/cc-runtime
3536
/decompressor/tinf
37+
/decompressor/cc-runtime.c
3638
/dtc
3739
/tinf
3840
/ovmf*

‎GNUmakefile.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ dist:
311311
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/nyu-efi/.git"
312312
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/nyu-efi/.gitignore"
313313
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/cc-runtime/.git"
314-
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/cc-runtime/.gitignore"
315314
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/dtc"
316315
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/tinf"
317316
rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/common/lib/stb_image.h.nopatch"
@@ -341,7 +340,7 @@ distclean: clean
341340

342341
.PHONY: maintainer-clean
343342
maintainer-clean: distclean
344-
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 freestnd-c-hdrs cc-runtime nyu-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
343+
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 freestnd-c-hdrs cc-runtime common/cc-runtime.s2.c decompressor/cc-runtime.c nyu-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
345344

346345
.PHONY: common-uefi-x86-64
347346
common-uefi-x86-64:

‎bootstrap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ if ! test -f version; then
7878
clone_repo_commit \
7979
https://codeberg.org/osdev/cc-runtime.git \
8080
cc-runtime \
81-
576a01179f3298a4795b92f42c088f9f8800b56b
81+
b4d3b970b2f6e7d08360c66eea8314e8dd901490
82+
cp cc-runtime/cc-runtime.c common/cc-runtime.s2.c
83+
cp cc-runtime/cc-runtime.c decompressor/cc-runtime.c
8284

8385
clone_repo_commit \
8486
https://codeberg.org/osdev/freestanding-toolchain.git \

‎common/common.mk‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ MAKEFLAGS += -rR
22
.SUFFIXES:
33

44
include $(TOOLCHAIN_FILE)
5-
export AR_FOR_TARGET
65
export CC_FOR_TARGET
76
export LD_FOR_TARGET
87
export OBJDUMP_FOR_TARGET
@@ -279,16 +278,6 @@ ifeq ($(TARGET),uefi-loongarch64)
279278
all: $(call MKESCAPE,$(BUILDDIR))/BOOTLOONGARCH64.EFI
280279
endif
281280

282-
$(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a: ../cc-runtime/*
283-
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
284-
rm -rf '$(call SHESCAPE,$(BUILDDIR))/cc-runtime'
285-
cp -r ../cc-runtime '$(call SHESCAPE,$(BUILDDIR))/'
286-
$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/cc-runtime' -f cc-runtime.mk \
287-
CC="$(CC_FOR_TARGET)" \
288-
AR="$(AR_FOR_TARGET)" \
289-
CFLAGS="$(CFLAGS_FOR_TARGET)" \
290-
CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs -DCC_RUNTIME_NO_FLOAT'
291-
292281
ifeq ($(TARGET),bios)
293282

294283
$(call MKESCAPE,$(BUILDDIR))/stage2.bin.gz: $(call MKESCAPE,$(BUILDDIR))/stage2.bin
@@ -317,7 +306,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_stage2only.ld: linker_bios.ld.in
317306
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
318307
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_STAGE2ONLY linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
319308

320-
$(call MKESCAPE,$(BUILDDIR))/limine_stage2only.elf: $(OBJ_S2) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
309+
$(call MKESCAPE,$(BUILDDIR))/limine_stage2only.elf: $(OBJ_S2)
321310
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld'
322311
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_stage2only.ld' -o '$(call SHESCAPE,$@)' || \
323312
( echo "This error may mean that stage 2 was trying to use stage 3 symbols before loading stage 3" && \
@@ -330,7 +319,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nos2map.ld: linker_bios.ld.in
330319
$(call MKESCAPE,$(BUILDDIR))/empty:
331320
touch '$(call SHESCAPE,$@)'
332321

333-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
322+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(OBJ)
334323
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
335324
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nos2map.ld'
336325
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_nos2map.ld' -o '$(call SHESCAPE,$@)'
@@ -348,7 +337,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_bios.ld.in
348337
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
349338
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
350339

351-
$(call MKESCAPE,$(BUILDDIR))/limine_nos3map.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/stage2.map.o
340+
$(call MKESCAPE,$(BUILDDIR))/limine_nos3map.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/stage2.map.o
352341
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
353342
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
354343
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -o '$(call SHESCAPE,$@)'
@@ -366,7 +355,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_bios.ld.in
366355
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
367356
$(CC_FOR_TARGET) -x c -E -P -undef linker_bios.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
368357

369-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/stage2.map.o $(call MKESCAPE,$(BUILDDIR))/full.map.o
358+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/stage2.map.o $(call MKESCAPE,$(BUILDDIR))/full.map.o
370359
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/empty'
371360
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
372361
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' -o '$(call SHESCAPE,$@)'
@@ -415,7 +404,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in
415404
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
416405
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
417406

418-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_x86_64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
407+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_x86_64.c.o $(OBJ)
419408
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
420409
$(LD_FOR_TARGET) \
421410
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
@@ -425,7 +414,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_x86_64.ld.in
425414
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
426415
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
427416

428-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_x86_64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/full.map.o
417+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-x86_64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_x86_64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
429418
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
430419
$(LD_FOR_TARGET) \
431420
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
@@ -462,7 +451,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_aarch64.ld.in
462451
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
463452
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_aarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
464453

465-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_aarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
454+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_aarch64.c.o $(OBJ)
466455
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
467456
$(LD_FOR_TARGET) \
468457
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
@@ -472,7 +461,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_aarch64.ld.in
472461
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
473462
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_aarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
474463

475-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_aarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/full.map.o
464+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-aarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_aarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
476465
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
477466
$(LD_FOR_TARGET) \
478467
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
@@ -508,7 +497,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_riscv64.ld.in
508497
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
509498
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_riscv64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
510499

511-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_riscv64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
500+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_riscv64.c.o $(OBJ)
512501
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
513502
$(LD_FOR_TARGET) \
514503
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
@@ -518,7 +507,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_riscv64.ld.in
518507
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
519508
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_riscv64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
520509

521-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_riscv64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/full.map.o
510+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-riscv64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_riscv64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
522511
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
523512
$(LD_FOR_TARGET) \
524513
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
@@ -554,7 +543,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_loongarch64.ld.in
554543
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
555544
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_loongarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
556545

557-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_loongarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
546+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_loongarch64.c.o $(OBJ)
558547
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
559548
$(LD_FOR_TARGET) \
560549
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
@@ -564,7 +553,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_loongarch64.ld.in
564553
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
565554
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_loongarch64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
566555

567-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_loongarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/full.map.o
556+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-loongarch64.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_loongarch64.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
568557
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
569558
$(LD_FOR_TARGET) \
570559
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \
@@ -600,7 +589,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in
600589
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
601590
$(CC_FOR_TARGET) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
602591

603-
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_ia32.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
592+
$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_ia32.c.o $(OBJ)
604593
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld'
605594
$(LD_FOR_TARGET) \
606595
-T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \
@@ -610,7 +599,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_ia32.ld.in
610599
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
611600
$(CC_FOR_TARGET) -x c -E -P -undef linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
612601

613-
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_ia32.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a $(call MKESCAPE,$(BUILDDIR))/full.map.o
602+
$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/crt0-efi-ia32.S.o $(call MKESCAPE,$(BUILDDIR))/nyu-efi/src/reloc_ia32.c.o $(OBJ) $(call MKESCAPE,$(BUILDDIR))/full.map.o
614603
$(MAKE) -f common.mk '$(call SHESCAPE,$(BUILDDIR))/linker.ld'
615604
$(LD_FOR_TARGET) \
616605
-T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \

‎common/linker_bios.ld.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ SECTIONS
1818
.text.stage2 : {
1919
*(.entry)
2020
*(.realmode)
21-
*cc-runtime.a:*(.text .text.*)
2221
*.s2.o(.text .text.*)
2322
} :text_s2
2423

2524
.rodata.stage2 : {
26-
*cc-runtime.a:*(.rodata .rodata.*)
2725
*.s2.o(.rodata .rodata.*)
2826

2927
build_id_s2 = .;
@@ -57,7 +55,6 @@ SECTIONS
5755

5856
.data.stage2 : {
5957
s2_data_begin = .;
60-
*cc-runtime.a:*(.data .data.*)
6158
*.s2.o(.data .data.*)
6259
s2_data_end = .;
6360

‎configure.ac‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ AC_CHECK_HEADERS([stdint.h stddef.h stdbool.h limits.h inttypes.h stdio.h stdlib
114114
[], [AC_MSG_ERROR([required header not found])])
115115

116116
AC_ARG_VAR([TOOLCHAIN_FOR_TARGET], [alternative toolchain prefix for Limine (or 'llvm', or 'gnu')])
117-
AC_ARG_VAR([AR_FOR_TARGET], [archiver command for Limine])
118117
AC_ARG_VAR([CC_FOR_TARGET], [C compiler command for Limine])
119118
AC_ARG_VAR([LD_FOR_TARGET], [linker command for Limine])
120119
AC_ARG_VAR([OBJCOPY_FOR_TARGET], [objcopy command for Limine])
@@ -168,8 +167,6 @@ else
168167
ARCHITECTURE=i686 \
169168
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
170169
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
171-
WANT_FREESTANDING_AR=yes \
172-
FREESTANDING_AR="$AR_FOR_TARGET" \
173170
WANT_FREESTANDING_CC=yes \
174171
FREESTANDING_CC="$CC_FOR_TARGET" \
175172
WANT_FREESTANDING_LD=yes \
@@ -202,8 +199,6 @@ else
202199
ARCHITECTURE=i686 \
203200
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
204201
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
205-
WANT_FREESTANDING_AR=yes \
206-
FREESTANDING_AR="$AR_FOR_TARGET" \
207202
WANT_FREESTANDING_CC=yes \
208203
FREESTANDING_CC="$CC_FOR_TARGET" \
209204
WANT_FREESTANDING_LD=yes \
@@ -233,8 +228,6 @@ else
233228
ARCHITECTURE=x86_64 \
234229
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
235230
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
236-
WANT_FREESTANDING_AR=yes \
237-
FREESTANDING_AR="$AR_FOR_TARGET" \
238231
WANT_FREESTANDING_CC=yes \
239232
FREESTANDING_CC="$CC_FOR_TARGET" \
240233
WANT_FREESTANDING_LD=yes \
@@ -264,8 +257,6 @@ else
264257
ARCHITECTURE=aarch64 \
265258
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
266259
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
267-
WANT_FREESTANDING_AR=yes \
268-
FREESTANDING_AR="$AR_FOR_TARGET" \
269260
WANT_FREESTANDING_CC=yes \
270261
FREESTANDING_CC="$CC_FOR_TARGET" \
271262
WANT_FREESTANDING_LD=yes \
@@ -294,8 +285,6 @@ else
294285
ARCHITECTURE=riscv64 \
295286
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
296287
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
297-
WANT_FREESTANDING_AR=yes \
298-
FREESTANDING_AR="$AR_FOR_TARGET" \
299288
WANT_FREESTANDING_CC=yes \
300289
FREESTANDING_CC="$CC_FOR_TARGET" \
301290
WANT_FREESTANDING_LD=yes \
@@ -324,8 +313,6 @@ else
324313
ARCHITECTURE=loongarch64 \
325314
FREESTANDING_TOOLCHAIN_SUFFIX="_FOR_TARGET" \
326315
FREESTANDING_TOOLCHAIN="$TOOLCHAIN_FOR_TARGET" \
327-
WANT_FREESTANDING_AR=yes \
328-
FREESTANDING_AR="$AR_FOR_TARGET" \
329316
WANT_FREESTANDING_CC=yes \
330317
FREESTANDING_CC="$CC_FOR_TARGET" \
331318
WANT_FREESTANDING_LD=yes \

‎decompressor/decompressor.mk‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ MAKEFLAGS += -rR
33

44
include $(TOOLCHAIN_FILE)
55

6-
override SRCDIR := $(shell pwd -P)
7-
86
override SPACE := $(subst ,, )
97

108
override MKESCAPE = $(subst $(SPACE),\ ,$(1))
@@ -64,17 +62,7 @@ override HEADER_DEPS := $(addprefix $(call MKESCAPE,$(BUILDDIR))/, $(C_FILES:.c=
6462
.PHONY: all
6563
all: $(call MKESCAPE,$(BUILDDIR))/decompressor.bin
6664

67-
$(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a: ../cc-runtime/*
68-
$(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'
69-
rm -rf '$(call SHESCAPE,$(BUILDDIR))/cc-runtime'
70-
cp -r ../cc-runtime '$(call SHESCAPE,$(BUILDDIR))/'
71-
$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/cc-runtime' -f cc-runtime.mk \
72-
CC="$(CC_FOR_TARGET)" \
73-
AR="$(AR_FOR_TARGET)" \
74-
CFLAGS="$(CFLAGS_FOR_TARGET)" \
75-
CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs -DCC_RUNTIME_NO_FLOAT'
76-
77-
$(call MKESCAPE,$(BUILDDIR))/decompressor.bin: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
65+
$(call MKESCAPE,$(BUILDDIR))/decompressor.bin: $(OBJ)
7866
$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$(BUILDDIR))/decompressor.elf'
7967
$(OBJCOPY_FOR_TARGET) -O binary '$(call SHESCAPE,$(BUILDDIR))/decompressor.elf' '$(call SHESCAPE,$@)'
8068

0 commit comments

Comments
 (0)