diff options
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 |