renamed i386 to x86

17 files changed, 6 insertions, 13 deletions

diff --git a/kernel/arch/i386/boot.asm b/kernel/arch/x86/boot.asm
index 42c11e6..42c11e6 100644
--- a/kernel/arch/i386/boot.asm
+++ b/kernel/arch/x86/boot.asm
diff --git a/kernel/arch/i386/crti.asm b/kernel/arch/x86/crti.asm
index 51f27d9..51f27d9 100644
--- a/kernel/arch/i386/crti.asm
+++ b/kernel/arch/x86/crti.asm
diff --git a/kernel/arch/i386/crtn.asm b/kernel/arch/x86/crtn.asm
index 370f4ae..370f4ae 100644
--- a/kernel/arch/i386/crtn.asm
+++ b/kernel/arch/x86/crtn.asm
diff --git a/kernel/arch/i386/gdt.asm b/kernel/arch/x86/gdt.asm
index e3af8bd..e3af8bd 100644
--- a/kernel/arch/i386/gdt.asm
+++ b/kernel/arch/x86/gdt.asm
diff --git a/kernel/arch/i386/gdt2.cpp b/kernel/arch/x86/gdt2.cpp
index 0acdb0e..0acdb0e 100644
--- a/kernel/arch/i386/gdt2.cpp
+++ b/kernel/arch/x86/gdt2.cpp
diff --git a/kernel/arch/i386/idt.cpp b/kernel/arch/x86/idt.cpp
index a8f3ff4..a8f3ff4 100644
--- a/kernel/arch/i386/idt.cpp
+++ b/kernel/arch/x86/idt.cpp
diff --git a/kernel/arch/i386/isr.asm b/kernel/arch/x86/isr.asm
index 4ccbaf9..4ccbaf9 100644
--- a/kernel/arch/i386/isr.asm
+++ b/kernel/arch/x86/isr.asm
diff --git a/kernel/arch/i386/isr_handler.cpp b/kernel/arch/x86/isr_handler.cpp
index ac8fb49..ac8fb49 100644
--- a/kernel/arch/i386/isr_handler.cpp
+++ b/kernel/arch/x86/isr_handler.cpp
diff --git a/kernel/arch/i386/linker.ld b/kernel/arch/x86/linker.ld
index c4bfa3b..c4bfa3b 100644
--- a/kernel/arch/i386/linker.ld
+++ b/kernel/arch/x86/linker.ld
diff --git a/kernel/arch/i386/multiboot.cpp b/kernel/arch/x86/multiboot.cpp
index 9f3eedb..9f3eedb 100644
--- a/kernel/arch/i386/multiboot.cpp
+++ b/kernel/arch/x86/multiboot.cpp
diff --git a/kernel/arch/i386/multiboot.h b/kernel/arch/x86/multiboot.h
index 0951ebe..0951ebe 100644
--- a/kernel/arch/i386/multiboot.h
+++ b/kernel/arch/x86/multiboot.h
diff --git a/kernel/arch/i386/pic.cpp b/kernel/arch/x86/pic.cpp
index 78cbcf8..78cbcf8 100644
--- a/kernel/arch/i386/pic.cpp
+++ b/kernel/arch/x86/pic.cpp
diff --git a/kernel/arch/i386/ps2_controller.cpp b/kernel/arch/x86/ps2_controller.cpp
index 9424233..9424233 100644
--- a/kernel/arch/i386/ps2_controller.cpp
+++ b/kernel/arch/x86/ps2_controller.cpp
diff --git a/kernel/arch/i386/tmtty.cpp b/kernel/arch/x86/tmtty.cpp
index d4dc772..d4dc772 100644
--- a/kernel/arch/i386/tmtty.cpp
+++ b/kernel/arch/x86/tmtty.cpp
diff --git a/kernel/arch/i386/vga.h b/kernel/arch/x86/vga.h
index 5b6b351..5b6b351 100644
--- a/kernel/arch/i386/vga.h
+++ b/kernel/arch/x86/vga.h
diff --git a/kernel/makefile b/kernel/makefile
index 88659d9..7d02b32 100644
--- a/kernel/makefile
+++ b/kernel/makefile
@@ -1,25 +1,18 @@
 # Kernel makefile

 

-ifndef GAS

-	GAS = i686-elf-as

-endif

-

 ifndef CFLAGS

 	CFLAGS = -ffreestanding -Wall -Wextra -g -std=gnu99 -O2 -Iinclude

-	CFLAGS += --sysroot="$(SYSROOT)"

 	CFLAGS += -isystem="/usr/include"

 endif

 

 ifndef CXXFLAGS

 	CXXFLAGS = -ffreestanding -Wall -Wextra -fno-exceptions -fno-rtti -D__is_kernel -g -O2 -Iinclude

 	CXXFLAGS += -Iinclude

-	CXXFLAGS += --sysroot="$(SYSROOT)"

 	CXXFLAGS += -isystem="/usr/include"

 endif

 

 ifndef LDFLAGS

 	LDFLAGS = -T arch/$(ARCH)/linker.ld -ffreestanding -g -O2 -Iinclude

-	LDFLAGS += --sysroot="$(SYSROOT)"

 	LDFLAGS += -isystem="/usr/include"

 endif

 

diff --git a/makefile b/makefile
index ccd252c..c52dd4c 100644
--- a/makefile
+++ b/makefile
@@ -1,16 +1,16 @@
 # The makefile

 

 OS_NAME		:= emuos

-ARCH		= i386

+ARCH		?= x86_64

 export SYSROOT = $(PWD)/sysroot

 

 # Variables for easy access of tools like gcc and nasm

-export CC		= i686-elf-gcc

-export CXX		= i686-elf-g++

-export LD		= i686-elf-ld 

+export CC		= $(ARCH)-elf-gcc

+export CXX		= $(ARCH)-elf-g++

+export LD		= $(ARCH)-elf-ld 

 export NASM		= nasm

-QEMU		= qemu-system-i386

-ASMFLAGS	= -felf32

+QEMU		= qemu-system-x86_64

+#ASMFLAGS	= -felf32

 #CXXFLAGS 	:= -ffreestanding -O2 -Wall -Wextra -fno-exceptions -fno-rtti

 #LDFLAGS	:= -ffreestanding -O2 -nostdlib