summaryrefslogtreecommitdiff
path: root/src/commonlib
diff options
context:
space:
mode:
Diffstat (limited to 'src/commonlib')
-rw-r--r--src/commonlib/include/commonlib/cbfs_serialized.h7
-rw-r--r--src/commonlib/include/commonlib/helpers.h9
2 files changed, 1 insertions, 15 deletions
diff --git a/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h
index a4708e8124..d3a18c600a 100644
--- a/src/commonlib/include/commonlib/cbfs_serialized.h
+++ b/src/commonlib/include/commonlib/cbfs_serialized.h
@@ -187,11 +187,6 @@ struct cbfs_file_attr_align {
uint32_t alignment;
} __packed;
-/*
- * ROMCC does not understand uint64_t, so we hide future definitions as they are
- * unlikely to be ever needed from ROMCC
- */
-#ifndef __ROMCC__
/*** Component sub-headers ***/
@@ -236,6 +231,4 @@ struct cbfs_optionrom {
uint32_t len;
} __packed;
-#endif /* __ROMCC__ */
-
#endif /* _CBFS_SERIALIZED_H_ */
diff --git a/src/commonlib/include/commonlib/helpers.h b/src/commonlib/include/commonlib/helpers.h
index ca3b3c58f9..f07b6c22f1 100644
--- a/src/commonlib/include/commonlib/helpers.h
+++ b/src/commonlib/include/commonlib/helpers.h
@@ -41,13 +41,10 @@
var_a op var_b ? var_a : var_b; \
})
-#ifdef __ROMCC__ /* romcc doesn't support __builtin_choose_expr() */
-#define __CMP(a, b, op) __CMP_UNSAFE(a, b, op)
-#else
+
#define __CMP(a, b, op) __builtin_choose_expr( \
__builtin_constant_p(a) && __builtin_constant_p(b), \
__CMP_UNSAFE(a, b, op), __CMP_SAFE(a, b, op, __TMPNAME, __TMPNAME))
-#endif
#ifndef MIN
#define MIN(a, b) __CMP(a, b, <)
@@ -108,12 +105,8 @@
#define GHz (1000 * MHz)
#ifndef offsetof
-#ifdef __ROMCC__
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#else
#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER)
#endif
-#endif
#define check_member(structure, member, offset) _Static_assert( \
offsetof(struct structure, member) == offset, \