From eff3508f16c9daa3d701fbfb89fb74a8205c8c69 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 15 Oct 2015 14:58:05 -0400
Subject: [PATCH] x86: Remove cosmetic traces of Diab toolchain

Updates several files to remove mention of Diab toolchain
support, which is no longer supported. These changes do not
affect system operation.

Change-Id: If9de85e595f6685295e565bc94ca17f51d87513f
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
---
 arch/x86/include/nano_private.h  | 7 +++----
 include/arch/x86/arch.h          | 7 +++----
 include/arch/x86/linker-epilog.h | 7 -------
 include/linker-tool.h            | 2 --
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/arch/x86/include/nano_private.h b/arch/x86/include/nano_private.h
index 62db8eaf02e..094c7f49c63 100644
--- a/arch/x86/include/nano_private.h
+++ b/arch/x86/include/nano_private.h
@@ -835,10 +835,9 @@ static inline void fiberRtnValueSet(
  * Performance optimization
  *
  * Macro PERF_OPT is defined if project is compiled with option other than
- * size optimization ("-Os" for GCC, "-XO -Xsize-opt" for Diab). If the
- * last of the compiler options is the size optimization, PERF_OPT is not
- * defined and the project is optimized for size, hence the stub should be
- * aligned to 1 and not 16.
+ * size optimization ("-Os" for GCC). If the last of the compiler options
+ * is the size optimization, PERF_OPT is not defined and the project is
+ * optimized for size, hence the stub should be aligned to 1 and not 16.
  */
 #ifdef PERF_OPT
 #define _EXC_STUB_ALIGN 16
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index 494d8fa310b..79ce73066be 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -48,10 +48,9 @@
  * Performance optimization
  *
  * Macro PERF_OPT is defined if project is compiled with option other than
- * size optimization ("-Os" for GCC, "-XO -Xsize-opt" for Diab). If the
- * last of the compiler options is the size optimization, PERF_OPT is not
- * defined and the project is optimized for size, hence the stub should be
- * aligned to 1 and not 16.
+ * size optimization ("-Os" for GCC). If the last of the compiler options
+ * is the size optimization, PERF_OPT is not defined and the project is
+ * optimized for size, hence the stub should be aligned to 1 and not 16.
  */
 #ifdef PERF_OPT
 #define _INT_STUB_ALIGN	16
diff --git a/include/arch/x86/linker-epilog.h b/include/arch/x86/linker-epilog.h
index 050c1486fa0..14a7380acb1 100644
--- a/include/arch/x86/linker-epilog.h
+++ b/include/arch/x86/linker-epilog.h
@@ -23,12 +23,6 @@
 
 #ifdef _LINKER
 
-/*
- * DIAB linker does not support multiple SECTIONS commands
- * in linker script
- */
-#if defined(__GCC_LINKER_CMD__)
-
 /*
  * The following guard prevents usage of orphaned sections --
  * the sections that are not explicitly mentioned in the linker script
@@ -76,7 +70,6 @@ SECTIONS
 	}
 ASSERT(SIZEOF(.trashcan) == 0, "Section(s) undefined in the linker script used.")
 
-#endif /* (__GCC_LINKER_CMD__) */
 #endif /* _LINKER */
 
 #endif /* _LINKER_EPILOG_H */
diff --git a/include/linker-tool.h b/include/linker-tool.h
index 2c1f2334d21..5792e9cfaa1 100644
--- a/include/linker-tool.h
+++ b/include/linker-tool.h
@@ -28,8 +28,6 @@ definitions (based on the toolchain) for the linker script.
 #if defined(_LINKER)
 #if defined(__GCC_LINKER_CMD__)
 #include <linker-tool-gcc.h>
-#elif defined(__DIAB_LINKER_CMD__)
-#include <linker-tool-diab.h>
 #else
 #error "Unknown toolchain"
 #endif