From 81bae882e1a4b4e631b4af04718a6145d839cb0b Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Mon, 1 Jun 2020 18:04:23 +0200 Subject: [PATCH] Changes with stack protector for gcc 10 --- Makefile | 2 +- ProjectTree | 47 ++++++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index ef8b839..8d6d851 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ LDFLAGS=-melf_x86_64 COPTIM=-O2 CWARNS=-Wall -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough -Werror=implicit-function-declaration -Werror=return-type #-Wpadded CINCLUDES=-Iinclude -Iinclude/drivers -Iinclude/kernel -CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -fstack-protector-all -fdump-rtl-expand +CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -fstack-protector-strong -fdump-rtl-expand CFLAGS2= -c -mno-red-zone -mno-mmx -mno-sse -mno-sse2 CFLAGS= $(CFLAGS1) $(CFLAGS2) CFLAGS_MATHS= $(CFLAGS1) -c -mno-red-zone -mno-mmx diff --git a/ProjectTree b/ProjectTree index 6e0b554..eb3d21e 100644 --- a/ProjectTree +++ b/ProjectTree @@ -26,26 +26,39 @@ . ├── boot │   ├── grub -│   │   ├── grub.cfg -│   │   └── multiboot.pdf -│   ├── loader -│   │   ├── cpu -│   │   │   ├── cpu32.inc -│   │   │   └── cpu.inc -│   │   ├── io -│   │   │   └── terminal.inc -│   │   ├── mem -│   │   │   ├── management.inc -│   │   │   └── structures.inc -│   │   ├── multiboot -│   │   │   ├── check.inc -│   │   │   └── header.inc -│   │   └── loader.asm -│   └── folder.desc +│   │   └── grub.cfg +│   └── loader +│   ├── cpu +│   │   ├── cpu32.inc +│   │   └── cpu.inc +│   ├── io +│   │   └── terminal.inc +│   ├── mem +│   │   ├── management.inc +│   │   └── structures.inc +│   ├── multiboot +│   │   ├── check.inc +│   │   └── header.inc +│   └── loader.asm ├── build │   ├── create_disk.sh │   ├── install-os-k.sh │   └── kernel.ld +├── docs +│   ├── boot +│   │   ├── grub +│   │   │   └── grub.desc +│   │   └── loader +│   │   ├── cpu +│   │   ├── io +│   │   └── loader.desc +│   ├── kaleid +│   │   ├── drivers +│   │   ├── kernel +│   │   ├── libbuf +│   │   └── libc +│   ├── COPYING.GFDL +│   └── Documentation ├── include │   ├── drivers │   │   └── ata.h @@ -166,4 +179,4 @@ ├── ProjectTree └── README.md -30 directories, 111 files +39 directories, 115 files