From 69a835d3117e57fa8f3df38b961997a2550218ae Mon Sep 17 00:00:00 2001 From: Frans Hendriks Date: Thu, 5 Jul 2018 11:47:49 +0200 Subject: util/cbfstool/compiler: __attribute redefinition In Windows Cygwin enviroment, compiler reports redefinition error at cbfstool/ifwitool.c on _packed and __aligned. Skip new defines when vales are already defined. Change-Id: I3af3c6b8fc57eee345afcef2f871b897138f78ce Signed-off-by: Frans Hendriks Reviewed-on: https://review.coreboot.org/27357 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/cbfstool/compiler.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util/cbfstool') 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)) -- cgit v1.2.3