diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:59:37 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:59:37 +0000 |
commit | e1fa6c74332b969ee49a93a15a52309f26577455 (patch) | |
tree | e0ea695214b7f89e1a380ececcb0d027c226d8c3 | |
parent | 50152de5fe5b8ce1583c04b28d681fe4e092c796 (diff) | |
parent | 18374a53dc8e00ec3667b4e1a257c9b4e41f007f (diff) | |
download | mclinker-e1fa6c74332b969ee49a93a15a52309f26577455.tar.gz |
Snap for 8564071 from 18374a53dc8e00ec3667b4e1a257c9b4e41f007f to mainline-cellbroadcast-releaseaml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000android13-mainline-cellbroadcast-release
Change-Id: I2e493920951714abf455ecd01c048e35c120606b
-rw-r--r-- | lib/LD/IdenticalCodeFolding.cpp | 3 | ||||
-rw-r--r-- | lib/Object/SectionMap.cpp | 3 | ||||
-rw-r--r-- | lib/Script/Assignment.cpp | 12 | ||||
-rw-r--r-- | tools/mcld/Android.bp | 1 |
4 files changed, 6 insertions, 13 deletions
diff --git a/lib/LD/IdenticalCodeFolding.cpp b/lib/LD/IdenticalCodeFolding.cpp index 5ba0fc1..a899bb0 100644 --- a/lib/LD/IdenticalCodeFolding.cpp +++ b/lib/LD/IdenticalCodeFolding.cpp @@ -126,8 +126,7 @@ void IdenticalCodeFolding::findCandidates(FoldingCandidates& pCandidateList) { for (sect = (*obj)->context()->sectBegin(); sect != sectEnd; ++sect) { switch ((*sect)->kind()) { case LDFileFormat::TEXT: { - candidate_map.insert( - std::make_pair(*sect, reinterpret_cast<LDSection*>(NULL))); + candidate_map.insert(std::make_pair(*sect, nullptr)); break; } case LDFileFormat::Relocation: { diff --git a/lib/Object/SectionMap.cpp b/lib/Object/SectionMap.cpp index 615c493..9cba895 100644 --- a/lib/Object/SectionMap.cpp +++ b/lib/Object/SectionMap.cpp @@ -193,8 +193,7 @@ SectionMap::mapping SectionMap::find(const std::string& pInputFile, return std::make_pair(*out, *in); } } - return std::make_pair(reinterpret_cast<Output*>(NULL), - reinterpret_cast<Input*>(NULL)); + return std::make_pair(nullptr, nullptr); } SectionMap::const_iterator SectionMap::find( diff --git a/lib/Script/Assignment.cpp b/lib/Script/Assignment.cpp index 333b366..1df7817 100644 --- a/lib/Script/Assignment.cpp +++ b/lib/Script/Assignment.cpp @@ -80,8 +80,7 @@ void Assignment::activate(Module& pModule) { switch (m_Level) { case OUTSIDE_SECTIONS: assert(!isLhsDot); - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); break; case OUTPUT_SECTION: { @@ -122,8 +121,7 @@ void Assignment::activate(Module& pModule) { if (isLhsDot) { out->dotAssignments().push_back(*this); } else { - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); } break; } @@ -138,8 +136,7 @@ void Assignment::activate(Module& pModule) { in->getSection()->getSectionData()->front()); Assignment assign( INPUT_SECTION, HIDDEN, *SymOperand::create("."), *expr); - in->dotAssignments().push_back( - std::make_pair(reinterpret_cast<Fragment*>(NULL), assign)); + in->dotAssignments().push_back(std::make_pair(nullptr, assign)); } Assignment& prevDotAssign = in->dotAssignments().back().second; @@ -158,8 +155,7 @@ void Assignment::activate(Module& pModule) { in->dotAssignments().push_back(std::make_pair( in->getSection()->getSectionData()->front().getNextNode(), *this)); } else { - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); } break; } diff --git a/tools/mcld/Android.bp b/tools/mcld/Android.bp index 3342f36..6681aae 100644 --- a/tools/mcld/Android.bp +++ b/tools/mcld/Android.bp @@ -42,7 +42,6 @@ cc_binary { // arch-specific static libraries depend on libmcldTarget. // Can be removed once soong supports transitive static library dependencies - group_static_libs: true, static_libs: [ "libmcldADT", "libmcldCore", |