From 3a0f83c7c8ef0b9e5fadf70a3c7049bee06e84e1 Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Wed, 17 Jan 2018 08:56:53 -0600 Subject: EKB side of changes for attributeOverride tool in x86.nfp context Change-Id: Ibc514c12567ab472d0eb55106356c84deff1897b CQ:SW411365 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52091 Tested-by: FSP CI Jenkins Reviewed-by: Martin Gloff Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: Hostboot CI Reviewed-by: Christian R. Geddes Tested-by: PPE CI Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52097 Reviewed-by: Sachin Gupta --- src/import/hwpf/fapi2/include/target_types.H | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/import/hwpf/fapi2') diff --git a/src/import/hwpf/fapi2/include/target_types.H b/src/import/hwpf/fapi2/include/target_types.H index 8747d7b7..fe8c888f 100644 --- a/src/import/hwpf/fapi2/include/target_types.H +++ b/src/import/hwpf/fapi2/include/target_types.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -253,12 +253,15 @@ enum TargetFilter : uint64_t }; +// attributeOverride tool requires x86.nfp compile +#ifndef CONTEXT_x86_nfp /// @cond constexpr TargetType operator|(TargetType x, TargetType y) { return static_cast(static_cast(x) | static_cast(y)); } +#endif template class bitCount -- cgit v1.2.1