From 1a1cebb0933682e39f949a744ff45f377afafb67 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Fri, 16 Jul 2021 08:36:10 +0200 Subject: [PATCH 1/4] Fix warnings about .intel_syntax attribute --- src/e820.s | 1 - src/stage_1.s | 1 - src/stage_2.s | 1 - src/stage_3.s | 1 - src/video_mode/vga_320x200.s | 1 - src/video_mode/vga_text_80x25.s | 1 - 6 files changed, 6 deletions(-) diff --git a/src/e820.s b/src/e820.s index 114de231..59d9c78b 100644 --- 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 index cbab048d..09ada795 100644 --- 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 index f5ad1141..8cf26ea0 100644 --- 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 index 112c68df..2f081afa 100644 --- 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 index 17d4a743..6cd20128 100644 --- 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 index 0ddb0d6f..4e65216a 100644 --- 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: From 36874961ec198bf562ec29427e8bb044586e49c4 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Fri, 16 Jul 2021 08:42:57 +0200 Subject: [PATCH 2/4] Fix warnings about panic field in target json file --- x86_64-bootloader.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json index ab1c5256..5a3376d6 100644 --- 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" } From ce64f2e6113e3ac98f931c6a9a3406053a6949a8 Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Fri, 16 Jul 2021 08:48:43 +0200 Subject: [PATCH 3/4] Remove unused relocation_model field in target json file --- x86_64-bootloader.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json index 5a3376d6..d8c0e494 100644 --- a/x86_64-bootloader.json +++ b/x86_64-bootloader.json @@ -17,6 +17,5 @@ "features": "-mmx,-sse,+soft-float", "disable-redzone": true, "panic-strategy": "abort", - "executables": true, - "relocation_model": "static" + "executables": true } From c96e1fb06717413a9b2413f46c37962d354d3d6e Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Sat, 17 Jul 2021 15:11:36 +0200 Subject: [PATCH 4/4] Fix relocation-model field name --- x86_64-bootloader.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json index d8c0e494..ceb196e9 100644 --- a/x86_64-bootloader.json +++ b/x86_64-bootloader.json @@ -17,5 +17,6 @@ "features": "-mmx,-sse,+soft-float", "disable-redzone": true, "panic-strategy": "abort", - "executables": true + "executables": true, + "relocation-model": "static" }