From ef660cf71813cff0d66c8fd1c176ddf491c7066d Mon Sep 17 00:00:00 2001
From: Recolic K <bensl@microsoft.com>
Date: Thu, 3 Jun 2021 15:21:36 +0800
Subject: [PATCH] temporarily removed libstdc++ test, and disable stack prot to
pass compilation
---
kernel/Makefile | 2 +-
kernel/kernel.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index 6796ba7..9f42440 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 47fdb41..c71565b 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());
}
--
GitLab