From 7189d84a085bb9edbbadad9f8ccc58b950ccb9ab Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Tue, 25 Sep 2018 15:18:51 -0400 Subject: [PATCH] Corrected the routines that determine the "best" name for a node so that they always give precedence to a port name over a global name. --- extflat/EFbuild.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extflat/EFbuild.c b/extflat/EFbuild.c index 65b25586..a5eeb411 100644 --- a/extflat/EFbuild.c +++ b/extflat/EFbuild.c @@ -1451,7 +1451,8 @@ efNodeAddName(node, he, hn) /* Link in the new name */ oldnn = node->efnode_name; - if (oldnn == NULL || EFHNBest(newnn->efnn_hier, oldnn->efnn_hier)) + if (oldnn == NULL || EFHNBest(newnn->efnn_hier, oldnn->efnn_hier) + || (node->efnode_flags & EF_PORT)) { /* New head of list */ newnn->efnn_next = oldnn; @@ -1534,7 +1535,7 @@ efNodeMerge(node1, node2) } /* Concatenate list of EFNodeNames, taking into account precedence */ - if (EFHNBest(node2->efnode_name->efnn_hier, + if ((node2->efnode_flags & EF_PORT) || EFHNBest(node2->efnode_name->efnn_hier, node1->efnode_name->efnn_hier)) { /*