diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2018-01-17 08:56:53 -0600 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-01-19 21:58:36 -0500 |
| commit | 3a0f83c7c8ef0b9e5fadf70a3c7049bee06e84e1 (patch) | |
| tree | 9fd35ccc02cb484e51a0e2e1644a4738d42969c0 /src | |
| parent | 5d57ec968d47e2093c71452d5052cba482a09a68 (diff) | |
| download | talos-sbe-3a0f83c7c8ef0b9e5fadf70a3c7049bee06e84e1.tar.gz talos-sbe-3a0f83c7c8ef0b9e5fadf70a3c7049bee06e84e1.zip | |
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 <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52097
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/hwpf/fapi2/include/target_types.H | 5 |
1 files changed, 4 insertions, 1 deletions
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<TargetType>(static_cast<int>(x) | static_cast<int>(y)); } +#endif template<uint64_t V> class bitCount |
