aboutsummaryrefslogtreecommitdiff
path: root/i686
diff options
context:
space:
mode:
Diffstat (limited to 'i686')
-rw-r--r--i686/sys/control.h6
-rw-r--r--i686/toolchain.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/i686/sys/control.h b/i686/sys/control.h
index 1b38472..7dde3c8 100644
--- a/i686/sys/control.h
+++ b/i686/sys/control.h
@@ -3,9 +3,13 @@
static inline void
abort()
{
- asm volatile(R"(cli
+ /* Symbol h is already defined?
+asm volatile(R"(cli
h: hlt
jmp h)");
+*/
+ asm volatile(R"(cli
+hlt)");
}
static inline void
diff --git a/i686/toolchain.mk b/i686/toolchain.mk
index 6f69cdb..43c758c 100644
--- a/i686/toolchain.mk
+++ b/i686/toolchain.mk
@@ -4,8 +4,8 @@ ARCH=i686
#
AS := i686-elf-as
CC := i686-elf-gcc
-CCFLAGS := -Wall -Wextra -Wpedantic -Wshadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 -mgeneral-regs-only
-CCFLAGS += $(shell echo ${CONFIG_CCFLAGS})
+CFLAGS := -Wall -Wextra -Wpedantic -Wshadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 -mgeneral-regs-only
+CFLAGS += $(shell echo ${CONFIG_CFLAGS})
LD := i686-elf-ld
LDFLAGS := -static -nostdlib
LDFLAGS += $(shell echo ${CONFIG_LDFLAGS})