summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/cbfstool/compiler.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h
index fc6a36b650..cf043d5893 100644
--- a/util/cbfstool/compiler.h
+++ b/util/cbfstool/compiler.h
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright 2017 Google Inc.
+ * Copyright (c) 2017-2018 Eltan B.V.
*
* 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
@@ -18,14 +19,18 @@
#if !defined(__FreeBSD__)
+#if !defined(__packed)
#if defined(__WIN32) || defined(__WIN64)
#define __packed __attribute__((gcc_struct, packed))
#else
#define __packed __attribute__((packed))
#endif
+#endif
+#if !defined(__aligned)
#define __aligned(x) __attribute__((aligned(x)))
#endif
+#endif
#define __always_unused __attribute__((unused))
#define __must_check __attribute__((warn_unused_result))