Cmake: Decouple how user & kernel flags are included

Building applications should should be orthogonal of how kernel is
build. But previously flags for both kernel and user applications were
set and dealt with together in 'mosflags.cmake' file.

Now 'userflags.cmake' & 'kernelflags.cmake' are separate files are
included individually corresponding to what is being build. Common
things are in 'commonflags.cmake.

Author: coderarjob

CMakeLists.txt

@@ -57,7 +57,6 @@ endif()
 #---------------------------------------------------------------------------
 
 include(cmake/compile_assemble_link.cmake)
-include(cmake/mosflags.cmake)
 
 set(MOS_BIN_DIR                    ${CMAKE_BINARY_DIR}/bin)
 set(MOS_OBJ_DIR                    ${CMAKE_BINARY_DIR}/obj)
@@ -191,6 +190,8 @@ if(CMAKE_CROSSCOMPILING)
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
         )
 else()
+    include(cmake/x86/unittestflags.cmake)
+
     #---------------------------------------------------------------------------
     # Validate compiler features required for compiling unittests
     #---------------------------------------------------------------------------

cmake/mosflags.cmake

@@ -0,0 +1,32 @@
+set(MOS_GCC_WARN_FLAGS
+    -Wpedantic
+    -Wall
+    -Wextra
+    -Wconversion
+    -Wdangling-else
+    -Werror
+    )
+
+set(MOS_GCC_FLAGS
+    -std=c99
+    -nostartfiles
+    -ffreestanding
+    -fno-pie
+    -fno-stack-protector
+    -fno-asynchronous-unwind-tables
+    -m32
+    -march=i686
+    -masm=intel
+    -mno-red-zone
+    -mno-sse
+    -malign-data=abi
+    -Os
+    -fno-unit-at-a-time
+    -fno-omit-frame-pointer
+    -fno-inline-functions-called-once
+)
+
+set(MOS_LINKER_OPTIONS
+    -ffreestanding
+    -nostdlib
+)

cmake/x86/commonflags.cmake

@@ -1,31 +1,12 @@
-set(MOS_KERNEL_GCC_WARN_FLAGS
-    -Wpedantic
-    -Wall
-    -Wextra
-    -Wconversion
-    -Wdangling-else
-    -Werror
-    )
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/commonflags.cmake)
 
+# ----------------------------------------------------
+# GCC
+# ----------------------------------------------------
 set(MOS_KERNEL_GCC_FLAGS
-    ${MOS_KERNEL_GCC_WARN_FLAGS}
-    -std=c99
-    -nostartfiles
-    -ffreestanding
-    -fno-pie
-    -fno-stack-protector
-    -fno-asynchronous-unwind-tables
-    -m32
-    -march=i686
-    -masm=intel
-    -mno-red-zone
-    -mno-sse
-    -malign-data=abi
-    -Os
-    -fno-unit-at-a-time
-    -fno-omit-frame-pointer
-    -fno-inline-functions-called-once
-    )
+    ${MOS_GCC_WARN_FLAGS}
+    ${MOS_GCC_FLAGS}
+)
 
 set(MOS_KERNEL_GCC_DEFINITIONS
     ${MOS_BUILD_MODE}
@@ -38,6 +19,13 @@ if (MOS_PORT_E9_ENABLED)
     list(APPEND MOS_KERNEL_GCC_DEFINITIONS PORT_E9_ENABLED)
 endif()
 
+set(MOS_KERNEL_GCC_INCLUDE_DIRS
+    ${PROJECT_SOURCE_DIR}/include
+)
+
+# ----------------------------------------------------
+# NASM
+# ----------------------------------------------------
 set(MOS_KERNEL_NASM_DEFINITIONS
     KERNEL
 )
@@ -57,8 +45,28 @@ set(MOS_KERNEL_ASM_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/include/x86/asm
 )
 
-set(MOS_KERNEL_GCC_INCLUDE_DIRS
-    ${PROJECT_SOURCE_DIR}/include
-)
+# ----------------------------------------------------
+# Both GCC & NASM
+# ----------------------------------------------------
+if (MOS_BUILD_MODE STREQUAL "DEBUG")
+    list(APPEND MOS_KERNEL_GCC_FLAGS -g)
+    list(APPEND MOS_KERNEL_NASM_ELF_MODE_FLAGS -g)
+endif()
+
+If (MOS_GRAPHICS_ENABLED)
+    list(APPEND MOS_KERNEL_GCC_DEFINITIONS
+        GRAPHICS_MODE_ENABLED
+        GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
+    )
+
+    list(APPEND MOS_KERNEL_NASM_DEFINITIONS
+        GRAPHICS_MODE_ENABLED
+        GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
+    )
+endif()
+
 
+# ----------------------------------------------------
+# LINKER
+# ----------------------------------------------------
 set(MOS_KERNEL_LINKER_SCRIPT_FILE ${PROJECT_SOURCE_DIR}/src/kernel/x86/kernel.ld)

cmake/x86/kernelflags.cmake

@@ -1,23 +1,10 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/commonflags.cmake)
+
 set(MOS_USER_GCC_FLAGS
-    ${MOS_KERNEL_GCC_WARN_FLAGS}
-    -std=c99
-    -nostartfiles
-    -ffreestanding
-    -fno-pie
-    -fno-stack-protector
-    -fno-asynchronous-unwind-tables
-    -m32
-    -march=i686
-    -masm=intel
-    -mno-red-zone
-    -mno-sse
-    -malign-data=abi
-    -Os
-    -fno-unit-at-a-time
-    -fno-omit-frame-pointer
-    -fno-inline-functions-called-once
+    ${MOS_GCC_WARN_FLAGS}
+    ${MOS_GCC_FLAGS}
     -fno-inline-small-functions
-    )
+)
 
 set(MOS_USER_GCC_DEFINITIONS
     ${MOS_BUILD_MODE}
@@ -29,5 +16,4 @@ set(MOS_USER_GCC_INCLUDE_DIRS
     ${PROJECT_SOURCE_DIR}/include/applib
 )
 
-
 set(MOS_USER_LINKER_SCRIPT_FILE ${PROJECT_SOURCE_DIR}/src/kernel/x86/process.ld)

cmake/x86/userflags.cmake

@@ -1,3 +1,5 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/userflags.cmake)
+
 # ---------------------------------------------------------------------------
 # Program - Proc1
 # ---------------------------------------------------------------------------

src/apps/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/kernelflags.cmake)
+
 # ------------------------------------------------------------------------
 # CRTA
 # Application C Runtime is analogous to the CRT in Linux, it provides prologue & epilogue code for

src/apps/applib/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/kernelflags.cmake)
+
 assemble_and_copy_bin(
     NAME boot0.flt
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boot0/boot.s

src/bootloader/x86/CMakeLists.txt

@@ -1,3 +1,8 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/kernelflags.cmake)
+
+#---------------------------------------------------------------------------
+# Build Arch independent kernel
+#---------------------------------------------------------------------------
 set(KERNEL_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/kpanic.c
     ${CMAKE_CURRENT_SOURCE_DIR}/kmalloc.c

src/kernel/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/kernelflags.cmake)
+
 set(DRIVER_SOUCES
     ${CMAKE_CURRENT_SOURCE_DIR}/8259_pic.c
     ${CMAKE_CURRENT_SOURCE_DIR}/8254_pit.c