From ab24d3119eb3b84ed028e4ac9aa3ec9b6f04f625 Mon Sep 17 00:00:00 2001 From: Andre Marin Date: Tue, 9 Jul 2019 15:50:06 -0400 Subject: [PATCH] Fix HB error with -Os compile flag due to eff_config Top level template is NOT unique between the two files when using the -Os compile flag. The linker just picks the wrong file template definition between p9a and p9n. In -O3 everything is left in place, inline so it just works which is why we didn't hit this error before in HB Change-Id: I66fb7db0ee688367600fa1c83cbf6c96006ee0af Original-Change-Id: I529f93fc91684ae14a132d96f518a5f66f036d4b Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80167 Tested-by: FSP CI Jenkins Tested-by: HWSV CI Tested-by: Jenkins Server Reviewed-by: STEPHEN GLANCY Reviewed-by: Louis Stermole Tested-by: Hostboot CI Dev-Ready: STEPHEN GLANCY Reviewed-by: Jennifer A Stofer --- .../explorer/procedures/hwp/memory/lib/shared/exp_consts.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H index ce9f9f6cf..1b437d915 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H @@ -90,9 +90,9 @@ enum attr_delay_index /// @brief enum list of explorer SPD derived attributes to set /// @note these attrs are strictly derived from SPD /// @warning wrapped in exp namesapce to be distinguished from -/// the generic attr_eff_engine_fields +/// the exp::attr_eff_engine_fields /// -enum attr_eff_engine_fields +enum class attr_eff_engine_fields { // Template recursive base case ATTR_EFF_BASE_CASE = 0, @@ -110,7 +110,7 @@ enum attr_eff_engine_fields ADDRESS_MIRROR = 10, // Dispatcher set to last enum value - ATTR_EFF_DISPATCHER = ADDRESS_MIRROR, + DISPATCHER = ADDRESS_MIRROR, }; ///