summaryrefslogtreecommitdiffstats
path: root/src/build/linker/linker.C
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2013-05-23 19:36:35 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-07-12 09:48:43 -0500
commitb9c5a79eb89e837981f7743569b715923d8b4c75 (patch)
treeec7df5130219d926eb3d00ff5de453696a726ba4 /src/build/linker/linker.C
parent1a0daf283888feaf77a2d7152b851498385b4491 (diff)
downloadtalos-hostboot-b9c5a79eb89e837981f7743569b715923d8b4c75.tar.gz
talos-hostboot-b9c5a79eb89e837981f7743569b715923d8b4c75.zip
Eliminate tracepp!
Change-Id: I67a7d626c81b0b90e25057c486d490e6e2b5aede Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5132 Tested-by: Jenkins Server Reviewed-by: Zane Shelley <zshelle@us.ibm.com> Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build/linker/linker.C')
-rw-r--r--src/build/linker/linker.C54
1 files changed, 31 insertions, 23 deletions
diff --git a/src/build/linker/linker.C b/src/build/linker/linker.C
index 1a9a88ba3..cebfb31d5 100644
--- a/src/build/linker/linker.C
+++ b/src/build/linker/linker.C
@@ -1,25 +1,25 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/build/linker/linker.C $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/linker/linker.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
/**
* @file linker.C Linker to generate the host boot binary images
*/
@@ -662,7 +662,10 @@ bool Object::read_relocation()
// Check weak symbol list for duplicate weak symbols.
if (syms[i]->flags & (BSF_WEAK))
{
- if (weak_symbols[syms[i]->name]++)
+ // Need to ignore special trace symbols.
+ if ((string::npos ==
+ string(syms[i]->name).find("traceData_codeInfo"))
+ && (weak_symbols[syms[i]->name]++))
{
weak_symbols_to_check.insert(syms[i]->name);
}
@@ -711,6 +714,11 @@ bool Object::read_relocation()
cout << "Relocs: " << std::dec << locs << endl;
for (int i = 0; i < locs; i++)
{
+ if (loc[i]->howto->name == string("R_PPC64_NONE"))
+ {
+ continue;
+ }
+
Symbol s;
s.name = loc[i]->sym_ptr_ptr[0]->name;
OpenPOWER on IntegriCloud