diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | apps/Makefile | 3 | ||||
| -rw-r--r-- | boot/Makefile | 2 | ||||
| -rw-r--r-- | kernel/Makefile | 3 | ||||
| -rw-r--r-- | libc/Makefile | 3 | ||||
| -rw-r--r-- | libgui/Makefile | 3 | ||||
| -rw-r--r-- | libnet/Makefile | 3 | ||||
| -rw-r--r-- | libtxt/Makefile | 3 |
8 files changed, 10 insertions, 21 deletions
@@ -1,13 +1,8 @@ # MIT License, Copyright (c) 2020 Marvin Borner -# Kernel optimization -OPTIMIZATION = -Ofast - -# Remove tree optimizations for kernel -#CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter -fno-tree-loop-vectorize -fno-inline-functions -fno-inline-functions-called-once -# Remove ipa optimizations for kernel -#CFLAGS_EXTRA += -fno-inline-functions -fno-inline-functions-called-once -fno-reorder-functions -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-ipa-profile -fno-ipa-pure-const -fno-ipa-reference -fno-ipa-reference-addressable -fno-merge-constants -fno-ipa-bit-cp -fno-ipa-cp -fno-ipa-icf -fno-ipa-ra -fno-ipa-sra -fno-ipa-vrp -fno-ipa-cp-clone -CFLAGS_EXTRA = -finline -finline-functions +CFLAGS_OPTIMIZATION = -finline -finline-functions -Ofast +CFLAGS_WARNINGS = -Wall -Wextra -pedantic -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wformat=2 #-Wmissing-declarations # TODO: Make more methods static +CFLAGS_DEFAULT = $(CFLAGS_WARNINGS) $(CFLAGS_OPTIMIZATION) -std=c99 -m32 -nostdlib -nostdinc -fno-builtin -fno-profile-generate -mno-red-zone all: compile diff --git a/apps/Makefile b/apps/Makefile index eec133d..6b54d17 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,8 +5,7 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -I../libnet/inc/ -fPIE -Duserspace -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -I../libnet/inc/ -fPIE -Duserspace all: $(COBJS) diff --git a/boot/Makefile b/boot/Makefile index 774eece..6d38ce5 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -5,7 +5,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy AS = ccache nasm -CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -std=c99 -m32 -pedantic-errors -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -ffreestanding ASFLAGS = -f elf32 diff --git a/kernel/Makefile b/kernel/Makefile index 492d975..f629b3d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -20,8 +20,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy AS = ccache nasm -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-profile-generate -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(CFLAGS_EXTRA) $(OPTIMIZATION) $(DEBUG) +CFLAGS = $(CFLAGS_DEFAULT) -Wno-address-of-packed-member -ffreestanding -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(DEBUG) ASFLAGS = -f elf32 all: compile diff --git a/libc/Makefile b/libc/Makefile index a3d1300..2d4d1b5 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -17,8 +17,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar AS = ccache nasm -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -Iinc/ -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -Iinc/ ASFLAGS = -f elf32 diff --git a/libgui/Makefile b/libgui/Makefile index b37bc3b..166a3c0 100644 --- a/libgui/Makefile +++ b/libgui/Makefile @@ -10,8 +10,7 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -Iinc/ -I../libc/inc/ -fPIE -Duserspace -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -Iinc/ -I../libc/inc/ -fPIE -Duserspace all: libgui diff --git a/libnet/Makefile b/libnet/Makefile index 43de0e2..37dad87 100644 --- a/libnet/Makefile +++ b/libnet/Makefile @@ -5,8 +5,7 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -Iinc/ -I../libc/inc/ -fPIE -Duserspace -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -Iinc/ -I../libc/inc/ -fPIE -Duserspace all: libtxt diff --git a/libtxt/Makefile b/libtxt/Makefile index 72b828f..d0d4c17 100644 --- a/libtxt/Makefile +++ b/libtxt/Makefile @@ -5,8 +5,7 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld AR = ccache ../cross/opt/bin/i686-elf-ar -WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -Iinc/ -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace -Ofast +CFLAGS = $(CFLAGS_DEFAULT) -Iinc/ -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace all: libtxt |