Просмотр исходного кода

chore: update Makefile.src, remove redundant files

add -melf_i386 to user space program compile options
greatbridf 11 месяцев назад
Родитель
Сommit
eccb650472
3 измененных файлов с 2 добавлено и 16 удалено
  1. 1 1
      Makefile.src
  2. 0 15
      cross-compile.cmake
  3. 1 0
      user-space-program/CMakeLists.txt

+ 1 - 1
Makefile.src

@@ -42,7 +42,7 @@ clean-all: clean
 
 .PHONY: debug
 debug:
-	$(GDB_BIN) --symbols=build/kernel.out --init-eval-command 'set pagination off' --init-eval-command 'target remote:1234' --eval-command 'hbr kernel_main' --eval-command 'c'
+	$(GDB_BIN) --symbols=build/kernel.out --init-eval-command 'source pretty-print.py' --init-eval-command 'set pagination off' --init-eval-command 'target remote:1234' --eval-command 'hbr _kernel_init' --eval-command 'c'
 
 build/boot.vdi: build/boot.img
 	-rm build/boot.vdi

+ 0 - 15
cross-compile.cmake

@@ -1,15 +0,0 @@
-set(CMAKE_SYSTEM_NAME Darwin)
-
-set(TOOLCHAIN_PATH_AND_PREFIX "/usr/local/bin/x86_64-elf-")
-
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PATH_AND_PREFIX}gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PATH_AND_PREFIX}c++)
-set(CMAKE_AR ${TOOLCHAIN_PATH_AND_PREFIX}ar)
-set(CMAKE_LINKER ${TOOLCHAIN_PATH_AND_PREFIX}ld)
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-SET(FDISK_BIN /usr/local/Cellar/util-linux/2.38_1/sbin/fdisk)

+ 1 - 0
user-space-program/CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_C_FLAGS "-nostdlib -nostdinc -static -m32 -W -Wall -Wextra -Werror -ms
 set(CMAKE_ASM_FLAGS "-nostdlib -m32 -static -mstack-protector-guard=global -g0")
 
 link_libraries(gblibc crt0)
+add_link_options("LINKER:-melf_i386")
 
 set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "")
 set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "")