From 6f5ea78a51cd756003314ccea0f6d7ddc615acfb Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 27 Feb 2015 10:48:55 +0100
Subject: [PATCH] hw_x86_64: Prefix gdt labels with _mt

Streamline the naming by prepending the _mt prefix to the gdt labels.
---
 repos/base-hw/src/core/include/spec/x86_64/gdt.h   |  4 ++--
 repos/base-hw/src/core/spec/x86_64/kernel/crt0.s   |  2 +-
 .../base-hw/src/core/spec/x86_64/mode_transition.s | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/repos/base-hw/src/core/include/spec/x86_64/gdt.h b/repos/base-hw/src/core/include/spec/x86_64/gdt.h
index 21ca6e4e4..09e42ba12 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/gdt.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/gdt.h
@@ -4,7 +4,7 @@
 #include <pseudo_descriptor.h>
 #include <mtc_util.h>
 
-extern int _gdt_start;
+extern int _mt_gdt_start;
 
 namespace Genode
 {
@@ -27,7 +27,7 @@ class Genode::Gdt
 		static void load(addr_t const virt_base)
 		{
 			asm volatile ("lgdt %0" : : "m" (Pseudo_descriptor (0x37,
-						  _virt_mtc_addr(virt_base, (addr_t)&_gdt_start))));
+						  _virt_mtc_addr(virt_base, (addr_t)&_mt_gdt_start))));
 		}
 };
 
diff --git a/repos/base-hw/src/core/spec/x86_64/kernel/crt0.s b/repos/base-hw/src/core/spec/x86_64/kernel/crt0.s
index ffc18eb37..2c69b887a 100644
--- a/repos/base-hw/src/core/spec/x86_64/kernel/crt0.s
+++ b/repos/base-hw/src/core/spec/x86_64/kernel/crt0.s
@@ -55,7 +55,7 @@
 	movl %eax, %cr0
 
 	/* Set up GDT */
-	lgdt _gdt_ptr
+	lgdt _mt_gdt_ptr
 
 	/* Indirect long jump to 64-bit code */
 	ljmp $8, $_start64
diff --git a/repos/base-hw/src/core/spec/x86_64/mode_transition.s b/repos/base-hw/src/core/spec/x86_64/mode_transition.s
index 566b91de7..d9bd1cd6b 100644
--- a/repos/base-hw/src/core/spec/x86_64/mode_transition.s
+++ b/repos/base-hw/src/core/spec/x86_64/mode_transition.s
@@ -268,14 +268,14 @@
 	.align 4
 	.space 2
 
-	.global _gdt_ptr
-	.global _gdt_start
-	_gdt_ptr:
-	.word _gdt_end - _gdt_start - 1 /* limit        */
-	.long _gdt_start                /* base address */
+	.global _mt_gdt_ptr
+	.global _mt_gdt_start
+	_mt_gdt_ptr:
+	.word _mt_gdt_end - _mt_gdt_start - 1 /* limit        */
+	.long _mt_gdt_start                   /* base address */
 
 	.align 8
-	_gdt_start:
+	_mt_gdt_start:
 	/* Null descriptor */
 	.quad 0
 	/* 64-bit code segment descriptor */
@@ -300,7 +300,7 @@
 	.long 0x8900
 	.long 0
 	.long 0
-	_gdt_end:
+	_mt_gdt_end:
 
 	/* end of the mode transition code */
 	.global _mt_end