Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / makeinc / toolchain.mkinc

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index a53848831733e7708a7c01e5fbb354d51506f3f4..246b9d15196ff53d78a318494311f206a1b07d2c 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -4,7 +4,7 @@ AS := $(CX_PREFIX)as
 AR := $(CX_PREFIX)ar
 LBUILD ?= $(shell realpath ./scripts/build-tools/luna_build.py)
 
 AR := $(CX_PREFIX)ar
 LBUILD ?= $(shell realpath ./scripts/build-tools/luna_build.py)
 

-O := -O2
+

 W := -Wall -Wextra -Werror \
                -Wno-unknown-pragmas \
                -Wno-unused-function \
 W := -Wall -Wextra -Werror \
                -Wno-unknown-pragmas \
                -Wno-unused-function \


@@ -14,21 +14,15 @@ W := -Wall -Wextra -Werror \
                -Wno-discarded-qualifiers\
                -Werror=incompatible-pointer-types
 
                -Wno-discarded-qualifiers\
                -Werror=incompatible-pointer-types
 

-OFLAGS := -fno-gcse\
-                 -fno-gcse-lm\
-                 -fno-cse-follow-jumps\
-                 -fno-cse-skip-blocks\
-                 -fno-optimize-strlen\
-                 -fno-inline-functions-called-once \
-                 -fno-inline-small-functions \
-                 -fno-indirect-inlining\
-                 -fno-omit-frame-pointer
+OFLAGS := -fno-omit-frame-pointer      \
+             -finline-small-functions

 
 

-CFLAGS := -std=gnu99 $(OFLAGS) $(W)
+CFLAGS := -std=gnu99 $(OFLAGS) $(W) -g

 
 ifeq ($(MODE),debug)
 
 ifeq ($(MODE),debug)

-       O = -Og
-       CFLAGS += -g
+       O := -Og
+else
+       O := -O2

 endif
 
 CFLAGS += $(O)
 endif
 
 CFLAGS += $(O)