diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2016-02-12 14:23:43 -0600 |
|---|---|---|
| committer | Santosh S. Puranik <santosh.puranik@in.ibm.com> | 2016-03-04 07:20:31 -0500 |
| commit | 40cd2e8e95ccb2e7208bc059508ffca71726815c (patch) | |
| tree | 2b8f24ccd7d9b60a58be45abcd40b499ed0d907c /import/hwpf | |
| parent | 8fdc2706a8a61987eda15ecd95fbb0cf72587fae (diff) | |
| download | talos-sbe-40cd2e8e95ccb2e7208bc059508ffca71726815c.tar.gz talos-sbe-40cd2e8e95ccb2e7208bc059508ffca71726815c.zip | |
Put in a #ifndef flag in because HB doesnt support TLS
Because HB has a bug in our TLS code that will take some time to resolve
we have placed a temporary flag in this file so that HB can build without
needed an extra cherry pick
Change-Id: Ie9c878f819bbd2c270df3fe9a09bf696d024bb73
RTC:146805
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24277
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21703
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Diffstat (limited to 'import/hwpf')
| -rw-r--r-- | import/hwpf/fapi2/include/return_code.H | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/import/hwpf/fapi2/include/return_code.H b/import/hwpf/fapi2/include/return_code.H index 2e1f0bf9..5ff02feb 100644 --- a/import/hwpf/fapi2/include/return_code.H +++ b/import/hwpf/fapi2/include/return_code.H @@ -136,9 +136,16 @@ class ReturnCode : public FirstFailureData<ReturnCode> /// This implementation assumes no exception handling and leverages thread-local /// storage. For platforms without thread support, a global variable will /// suffice for the error state. -extern thread_local ReturnCode current_err; /// the current error state + + extern thread_local uint64_t pib_error_mask; /// the pib mask extern thread_local uint64_t operational_state; /// the operational mode +#ifndef PLAT_NO_THREAD_LOCAL_STORAGE + extern thread_local ReturnCode current_err; /// the current error state +#else + extern ReturnCode current_err; +#endif + } #endif |
