<commit_before>export PATH := gcc-cross/bin/:$(PATH)
CC=i686-elf-gcc
AS=nasm

<<<<<<< HEAD
CFLAGS=-ffreestanding -O2 -nostdlib -Wall -Wextra
ASFLAGS=-felf32

HDRS=vga.h stdlib.h asmintr.h
OBJS=kernel.o vga.o stdlib.o asmintr.o boot.o
=======
CFLAGS=-ffreestanding -nostdlib -Wall -Wextra -g
ASFLAGS=-felf32 -F stabs -g

HDRS=vga.h stdlib.h asmintr.h idt.h
OBJS=kernel.o vga.o stdlib.o asmintr.o boot.o idt_s.o idt_c.o inthandle.o irq.o keyboard.o disk.o
>>>>>>> dev
PROG=fireos.bin

all:version.h $(PROG)
version.h:
	chmod +x mkver
	./mkver
$(PROG):$(OBJS) $(HDRS)
	$(CC) -T linker.ld -o $(PROG) -ffreestanding -O2 -nostdlib $(OBJS) -lgcc
clean:
	rm -f *.o $(PROG) version.h *~<commit_msg>Apparently, the conflicts weren't resolved enough.<commit_after>export PATH := gcc-cross/bin/:$(PATH)
CC=i686-elf-gcc
AS=nasm

CFLAGS=-ffreestanding -nostdlib -Wall -Wextra -g
ASFLAGS=-felf32 -F stabs -g

HDRS=vga.h stdlib.h asmintr.h idt.h
OBJS=kernel.o vga.o stdlib.o asmintr.o boot.o idt_s.o idt_c.o inthandle.o irq.o keyboard.o disk.o
PROG=fireos.bin

all:version.h $(PROG)
version.h:
	chmod +x mkver
	./mkver
$(PROG):$(OBJS) $(HDRS)
	$(CC) -T linker.ld -o $(PROG) -ffreestanding -O2 -nostdlib $(OBJS) -lgcc
clean:
	rm -f *.o $(PROG) version.h *~
{'fraction_non_alphanumeric': 0.1807909604519774, 'fraction_numerical': 0.012106537530266344, 'mean_word_length': 3.9011857707509883, 'pattern_counts': {'":': 0, '<': 10, '<?xml version=': 0, '>': 10, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2285366', 'n_tokens_mistral': 605, 'n_tokens_neox': 585, 'n_words': 131}