mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-02 15:38:22 +00:00
move arch include dir
This commit is contained in:
+2
-1
@@ -3,11 +3,12 @@ ASMSOURCES= $(shell find -name *.asm)
|
|||||||
OBJS=$(CSOURCES:.c=.o) $(ASMSOURCES:.asm=.asmo)
|
OBJS=$(CSOURCES:.c=.o) $(ASMSOURCES:.asm=.asmo)
|
||||||
TARGET=x86-64
|
TARGET=x86-64
|
||||||
INCDIR=$(shell pwd)/include
|
INCDIR=$(shell pwd)/include
|
||||||
|
ARCHINCDIR=$(shell pwd)/include/$(TARGET)/
|
||||||
ARCHDIR=$(shell pwd)/arch/$(TARGET)/
|
ARCHDIR=$(shell pwd)/arch/$(TARGET)/
|
||||||
LDFLAGS=-ffreestanding -nostdlib -lgcc -Wl,-T,"$(ARCHDIR)/kernel.ld" -debug
|
LDFLAGS=-ffreestanding -nostdlib -lgcc -Wl,-T,"$(ARCHDIR)/kernel.ld" -debug
|
||||||
# required for mpaland printf so it doesn't compile with floating point support, which results in build failures
|
# required for mpaland printf so it doesn't compile with floating point support, which results in build failures
|
||||||
PRINTFOPTS=-DPRINTF_DISABLE_SUPPORT_FLOAT
|
PRINTFOPTS=-DPRINTF_DISABLE_SUPPORT_FLOAT
|
||||||
CFLAGS=-ffreestanding -mcmodel=kernel -O2 -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -nostdlib -Wall -I "${INCDIR}" $(PRINTFOPTS)
|
CFLAGS=-ffreestanding -mcmodel=kernel -O2 -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -nostdlib -Wall -I "${INCDIR}" -I "$(ARCHINCDIR)" $(PRINTFOPTS)
|
||||||
ASFLAGS=-felf64
|
ASFLAGS=-felf64
|
||||||
|
|
||||||
astral: $(OBJS)
|
astral: $(OBJS)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include <arch/e9.h>
|
#include <arch/e9.h>
|
||||||
#include <logging.h>
|
#include <logging.h>
|
||||||
#include <arch/cpu.h>
|
#include <arch/cpu.h>
|
||||||
|
#include <arch/gdt.h>
|
||||||
|
|
||||||
static cpu_t bsp_cpu;
|
static cpu_t bsp_cpu;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#ifndef _GDT_H
|
||||||
|
#define _GDT_H
|
||||||
|
|
||||||
|
void arch_gdt_reload();
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user