fix: ssp is now enabled and it no longer crashes with several prints (so far)
This commit is contained in:
parent
20ba985b34
commit
d8d31d959f
6
Makefile
6
Makefile
@ -3,7 +3,7 @@ NAME := bozOS
|
|||||||
AS := i386-elf-as
|
AS := i386-elf-as
|
||||||
ASFLAGS :=
|
ASFLAGS :=
|
||||||
CC := i386-elf-gcc
|
CC := i386-elf-gcc
|
||||||
CFLAGS := -std=gnu99 -ffreestanding -Wall -Wextra -iquotelibbozo/headers -iquoteheaders -MMD -fno-omit-frame-pointer -g
|
CFLAGS := -std=gnu99 -ffreestanding -Wall -Wextra -iquotelibbozo/headers -iquoteheaders -MMD -fno-omit-frame-pointer -fstack-protector-all -g
|
||||||
LD := $(CC)
|
LD := $(CC)
|
||||||
LDFLAGS := -T boot/linker.ld -ffreestanding -nostdlib
|
LDFLAGS := -T boot/linker.ld -ffreestanding -nostdlib
|
||||||
LIBS := -L libbozo/build/ -lbozo -lgcc
|
LIBS := -L libbozo/build/ -lbozo -lgcc
|
||||||
@ -55,7 +55,9 @@ fclean: clean
|
|||||||
make -C libbozo fclean
|
make -C libbozo fclean
|
||||||
rm -rf build
|
rm -rf build
|
||||||
|
|
||||||
re: fclean all
|
re:
|
||||||
|
$(MAKE) fclean
|
||||||
|
$(MAKE) all
|
||||||
|
|
||||||
.PHONY: all clean fclean re run iso run-iso
|
.PHONY: all clean fclean re run iso run-iso
|
||||||
-include $(DEP)
|
-include $(DEP)
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
void kpanic(const char *format, ...);
|
__attribute__((noreturn)) void kpanic(const char *format, ...);
|
||||||
|
@ -18,6 +18,7 @@ void *alloc_frames(size_t size)
|
|||||||
kprintf("type: %d, addr: %p, len: %u, size: %u, \n",
|
kprintf("type: %d, addr: %p, len: %u, size: %u, \n",
|
||||||
mmmt->type, mmmt->addr, mmmt->len, mmmt->size);
|
mmmt->type, mmmt->addr, mmmt->len, mmmt->size);
|
||||||
}
|
}
|
||||||
|
PRINT_PTR(mmmt);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user