2-setup_gdt.md (#22)

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

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index 70ef37bf9c989ad716a2719e2cb722f7fa127ea8..c63f84628550d752c914dbd19503e872e403cc68 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -1,10 +1,13 @@
-CC := i686-elf-gcc
-AS := i686-elf-as
-AR := i686-elf-ar
-PY := python
+CC := $(CX_PREFIX)gcc
+CC := $(CX_PREFIX)gcc
+AS := $(CX_PREFIX)as
+AR := $(CX_PREFIX)ar
+PY := python3

 
 

+STRIP_OSDEP_CC := -ffreestanding -fno-pie
+STRIP_OSDEP_LD := -nostdlib -nolibc -z noexecstack -no-pie -Wl,--build-id=none

 
 

-ARCH_OPT := -D__ARCH_IA32
+ARCH_OPT := -m32 -D__ARCH_IA32

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


@@ -21,17 +24,18 @@ OFLAGS := -fno-gcse\
                  -fno-optimize-strlen\
                  -fno-inline-functions-called-once \
                  -fno-inline-small-functions \
                  -fno-optimize-strlen\
                  -fno-inline-functions-called-once \
                  -fno-inline-small-functions \

-                 -fno-indirect-inlining
+                 -fno-indirect-inlining\
+                 -fno-omit-frame-pointer

 
 

-CFLAGS := -std=gnu99 -ffreestanding -MMD $(OFLAGS) $(W) $(ARCH_OPT)
+CFLAGS := $(ARCH_OPT) -std=gnu99 $(OFLAGS) $(W)

 
 ifeq ($(BUILD_MODE),debug)
        O = -Og
        CFLAGS += -g
 endif
 
 
 ifeq ($(BUILD_MODE),debug)
        O = -Og
        CFLAGS += -g
 endif
 

-CFLAGS += $(O)
+CFLAGS += $(O) $(STRIP_OSDEP_CC)

 
 

-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+LDFLAGS := $(ARCH_OPT) $(O) $(STRIP_OSDEP_LD)

 
 MKFLAGS := --no-print-directory
\ No newline at end of file
 
 MKFLAGS := --no-print-directory
\ No newline at end of file