diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-04 23:42:42 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-10-08 16:57:27 +0000 |
| commit | d44221f9c8f3686e040ff9481829315068b321a3 (patch) | |
| tree | 76337bf1cae88feda44e3c63dd7e32e964e8767d /util/cbmem | |
| parent | 834543c0c71544b547194b093b8e1da990722762 (diff) | |
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>
Diffstat (limited to 'util/cbmem')
| -rw-r--r-- | util/cbmem/Makefile | 1 | ||||
| -rw-r--r-- | util/cbmem/compiler.h | 33 |
2 files changed, 1 insertions, 33 deletions
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile index 694cac7110..9e403a6414 100644 --- a/util/cbmem/Makefile +++ b/util/cbmem/Makefile @@ -21,6 +21,7 @@ PREFIX ?= /usr/local CFLAGS ?= -O2 CFLAGS += -Wall -Werror CPPFLAGS += -I . -I $(ROOT)/commonlib/include +CPPFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h OBJS = $(PROGRAM).o diff --git a/util/cbmem/compiler.h b/util/cbmem/compiler.h deleted file mode 100644 index fc6a36b650..0000000000 --- a/util/cbmem/compiler.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __COMPILER_H__ -#define __COMPILER_H__ - -#if !defined(__FreeBSD__) - -#if defined(__WIN32) || defined(__WIN64) -#define __packed __attribute__((gcc_struct, packed)) -#else -#define __packed __attribute__((packed)) -#endif - -#define __aligned(x) __attribute__((aligned(x))) -#endif - -#define __always_unused __attribute__((unused)) -#define __must_check __attribute__((warn_unused_result)) - -#endif |