From d44221f9c8f3686e040ff9481829315068b321a3 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Thu, 4 Oct 2018 23:42:42 +0200
Subject: Move compiler.h to commonlib

Its spreading copies got out of sync. And as it is not a standard header
but used in commonlib code, it belongs into commonlib. While we are at
it, always include it via GCC's `-include` switch.

Some Windows and BSD quirk handling went into the util copies. We always
guard from redefinitions now to prevent further issues.

Change-Id: I850414e6db1d799dce71ff2dc044e6a000ad2552
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/28927
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/arch/x86/include/arch/acpi.h         | 1 -
 src/arch/x86/include/arch/hlt.h          | 2 --
 src/arch/x86/include/arch/io.h           | 1 -
 src/arch/x86/include/arch/pci_io_cfg.h   | 1 -
 src/arch/x86/include/arch/pci_mmio_cfg.h | 1 -
 src/arch/x86/include/arch/pirq_routing.h | 1 -
 src/arch/x86/include/arch/registers.h    | 2 --
 src/arch/x86/include/arch/smp/atomic.h   | 2 --
 src/arch/x86/include/arch/smp/mpspec.h   | 1 -
 src/arch/x86/include/arch/smp/spinlock.h | 2 --
 10 files changed, 14 deletions(-)

(limited to 'src/arch/x86/include')

diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index c84adda0d0..54be1f40b7 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -54,7 +54,6 @@
 
 #if !defined(__ASSEMBLER__) && !defined(__ACPI__) && !defined(__ROMCC__)
 #include <stdint.h>
-#include <compiler.h>
 #include <rules.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
diff --git a/src/arch/x86/include/arch/hlt.h b/src/arch/x86/include/arch/hlt.h
index cf7176ae90..7b18f55657 100644
--- a/src/arch/x86/include/arch/hlt.h
+++ b/src/arch/x86/include/arch/hlt.h
@@ -20,8 +20,6 @@ static void hlt(void)
 	__builtin_hlt();
 }
 #else
-#include <compiler.h>
-
 static __always_inline void hlt(void)
 {
 	asm("hlt");
diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h
index 64b5f120e0..1b0fdb0515 100644
--- a/src/arch/x86/include/arch/io.h
+++ b/src/arch/x86/include/arch/io.h
@@ -14,7 +14,6 @@
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
-#include <compiler.h>
 #include <endian.h>
 #include <stdint.h>
 #include <rules.h>
diff --git a/src/arch/x86/include/arch/pci_io_cfg.h b/src/arch/x86/include/arch/pci_io_cfg.h
index 15d1a132cf..ddc62ed393 100644
--- a/src/arch/x86/include/arch/pci_io_cfg.h
+++ b/src/arch/x86/include/arch/pci_io_cfg.h
@@ -14,7 +14,6 @@
 #ifndef _PCI_IO_CFG_H
 #define _PCI_IO_CFG_H
 
-#include <compiler.h>
 #include <arch/io.h>
 
 static __always_inline
diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index a5ca574466..c660ed5332 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -17,7 +17,6 @@
 #define _PCI_MMIO_CFG_H
 
 #include <arch/io.h>
-#include <compiler.h>
 
 #define DEFAULT_PCIEXBAR	CONFIG_MMCONF_BASE_ADDRESS
 
diff --git a/src/arch/x86/include/arch/pirq_routing.h b/src/arch/x86/include/arch/pirq_routing.h
index 01179121ec..b416ec1422 100644
--- a/src/arch/x86/include/arch/pirq_routing.h
+++ b/src/arch/x86/include/arch/pirq_routing.h
@@ -28,7 +28,6 @@
 #define MAX_INTX_ENTRIES 4
 
 #include <stdint.h>
-#include <compiler.h>
 
 #define PIRQ_SIGNATURE	(('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))
 #define PIRQ_VERSION 0x0100
diff --git a/src/arch/x86/include/arch/registers.h b/src/arch/x86/include/arch/registers.h
index 9a618f4870..08f83ac091 100644
--- a/src/arch/x86/include/arch/registers.h
+++ b/src/arch/x86/include/arch/registers.h
@@ -16,8 +16,6 @@
 #ifndef __ARCH_REGISTERS_H
 #define __ARCH_REGISTERS_H
 
-#include <compiler.h>
-
 #if !defined(__ASSEMBLER__)
 #define DOWNTO8(A) \
 	union { \
diff --git a/src/arch/x86/include/arch/smp/atomic.h b/src/arch/x86/include/arch/smp/atomic.h
index b12da12e54..75650c7f98 100644
--- a/src/arch/x86/include/arch/smp/atomic.h
+++ b/src/arch/x86/include/arch/smp/atomic.h
@@ -14,8 +14,6 @@
 #ifndef ARCH_SMP_ATOMIC_H
 #define ARCH_SMP_ATOMIC_H
 
-#include <compiler.h>
-
 /*
  * Make sure gcc doesn't try to be clever and move things around
  * on us. We need to use _exactly_ the address the user gave us,
diff --git a/src/arch/x86/include/arch/smp/mpspec.h b/src/arch/x86/include/arch/smp/mpspec.h
index 8b3e8bb8f9..1e7300fea6 100644
--- a/src/arch/x86/include/arch/smp/mpspec.h
+++ b/src/arch/x86/include/arch/smp/mpspec.h
@@ -16,7 +16,6 @@
 #ifndef __ASM_MPSPEC_H
 #define __ASM_MPSPEC_H
 
-#include <compiler.h>
 #include <device/device.h>
 #include <cpu/x86/lapic_def.h>
 
diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h
index 212cd8cd64..183d726d19 100644
--- a/src/arch/x86/include/arch/smp/spinlock.h
+++ b/src/arch/x86/include/arch/smp/spinlock.h
@@ -14,8 +14,6 @@
 #ifndef ARCH_SMP_SPINLOCK_H
 #define ARCH_SMP_SPINLOCK_H
 
-#include <compiler.h>
-
 #if !defined(__PRE_RAM__) \
 	|| IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK)	\
 	|| IS_ENABLED(CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK)	\
-- 
cgit v1.2.3