From 31a07e2cc87a0a24099b6e8d7ccc5cb3d0729b67 Mon Sep 17 00:00:00 2001 From: Nick Bofferding Date: Fri, 6 Sep 2013 16:25:14 -0500 Subject: Support multinode targeting - Added support for master processor type attributes - Made attribute sync multinode aware - Added platform properties constants - Added multinode iterator support - Extended default iterator to skip hidden system targets - Added raw iterator to "see" hidden system targets - Updated target service to be multinode aware - Added new API to query master proc per node - Modified MRW parser to support cross node peers - Modified MRW parser to default master proc per node - Removed cross node peer workarounds in node splitter script - Added common support for master system targets - Updated attribute compiler to serialize cross node peer targets - Updated attribute compiler to generate attribute size map - Updated attribute compiler to impose special ordering on target layout - Inhibited XML merge script from merging itself in xmltohb makefile - Inhibited duplicate weak symbol errors in trace statements Change-Id: I661eca12f3a7cc16c0ff5476a7ae66cea3bad7d3 RTC: 63940 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6103 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/build/linker/linker.C | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/build/linker/linker.C') diff --git a/src/build/linker/linker.C b/src/build/linker/linker.C index e0ca2adc2..2a4c3ad16 100644 --- a/src/build/linker/linker.C +++ b/src/build/linker/linker.C @@ -374,8 +374,10 @@ int main(int argc, char** argv) j != all_symbols.end(); ++j) { - if ((string::npos != j->find(sym_name)) && - (*i != *j)) + if ( (string::npos != j->find(sym_name)) + && ( string::npos + == j->find("traceData_codeInfo")) + && (*i != *j)) { cout << "\tDuplicate member found: " << *j << endl; throw std::runtime_error( -- cgit v1.2.1