diff --git a/kernel/Makefile b/kernel/Makefile index 6796ba7ab52a407b92b22f49f10333f657133218..9f42440f73eb5985b7a7e71fa871da0e15007b5d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -15,7 +15,7 @@ head: nasm -f elf$(BITS) -DTARGET_BITS=$(BITS) image_head.asm -o image_head.o kernel: - g++ -ffreestanding -fpie -fno-exceptions -c kernel.cc -o kernel.o -m$(BITS) -std=c++17 + g++ -ffreestanding -fpie -fno-exceptions -fno-stack-protector -c kernel.cc -o kernel.o -m$(BITS) -std=c++17 clean: rm -f *.o *.img diff --git a/kernel/kernel.cc b/kernel/kernel.cc index 47fdb4141d3eea154f5a2d0c035c12b5fd0e1958..c71565bfe7848968484ffd454f0db77cc2578806 100644 --- a/kernel/kernel.cc +++ b/kernel/kernel.cc @@ -33,7 +33,7 @@ void main() { // print_char('0' + test_buf[i], default_color); // } // std::string s = "cxxhello world"; - std::basic_string<char, std::char_traits<char>, kallocator<char>> s = "cxx hello world"; - print(s.c_str()); + // std::basic_string<char, std::char_traits<char>, kallocator<char>> s = "cxx hello world"; + // print(s.c_str()); }