Merge pull request #185 from vinc/fix-compilation-warnings

phil-opp · web-flow · commit a562ba9801b2 · 2021-08-09T09:55:48.000+02:00
Fix compilation warnings on v0.9 branch
diff --git a/src/e820.s b/src/e820.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map
diff --git a/src/stage_1.s b/src/stage_1.s
@@ -1,6 +1,5 @@
 .section .boot-first-stage, "awx"
 .global _start
-.intel_syntax noprefix
 .code16
 
 # This stage initializes the stack, enables the A20 line, loads the rest of
diff --git a/src/stage_2.s b/src/stage_2.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # This stage sets the target operating mode, loads the kernel from disk,
diff --git a/src/stage_3.s b/src/stage_3.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code32
 
 # This stage performs some checks on the CPU (cpuid, long mode), sets up an
diff --git a/src/video_mode/vga_320x200.s b/src/video_mode/vga_320x200.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 config_video_mode:
diff --git a/src/video_mode/vga_text_80x25.s b/src/video_mode/vga_text_80x25.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 config_video_mode:
diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json
@@ -16,7 +16,7 @@
     "os": "none",
     "features": "-mmx,-sse,+soft-float",
     "disable-redzone": true,
-    "panic": "abort",
+    "panic-strategy": "abort",
     "executables": true,
-    "relocation_model": "static"
+    "relocation-model": "static"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`.section .boot, "awx"`
`2`		`-.intel_syntax noprefix`
`3`	`2`	`.code16`
`4`	`3`
`5`	`4`	`# From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map`