diff --git a/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch b/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch deleted file mode 100644 index a3837e5eb5b10ffb0ee8128f0ada6e717fb5dde4..0000000000000000000000000000000000000000 --- a/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 817b1e41a05309d776f595f3f3eb96f1d2e39f6c Mon Sep 17 00:00:00 2001 -From: zhangxianting -Date: Fri, 21 Jun 2024 09:54:01 +0800 -Subject: [PATCH] Fix FindTBB version detection with TBB >= 2021.1.1 - ---- - cmake/Modules/FindTBB.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dyninst-12.3.0/cmake/Modules/FindTBB.cmake b/dyninst-12.3.0/cmake/Modules/FindTBB.cmake -index cc62ffe..694e2df 100644 ---- a/cmake/Modules/FindTBB.cmake -+++ b/cmake/Modules/FindTBB.cmake -@@ -154,7 +154,8 @@ find_path( - if(TBB_INCLUDE_DIRS) - # Starting in 2020.1.1, tbb_stddef.h is replaced by version.h - set(_version_files "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" -- "${TBB_INCLUDE_DIRS}/tbb/version.h") -+ "${TBB_INCLUDE_DIRS}/tbb/version.h" -+ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h") - foreach(f IN ITEMS ${_version_files}) - if(EXISTS ${f}) - set(_version_file ${f}) --- -2.43.0 - diff --git a/dyninst-12.3.0.tar.gz b/dyninst-13.0.0.tar.gz similarity index 49% rename from dyninst-12.3.0.tar.gz rename to dyninst-13.0.0.tar.gz index 3d8df37a8933cf2279aa607e9244c75f3d2f0a23..661458b12d443b712cfa1692d609814acd73df47 100644 Binary files a/dyninst-12.3.0.tar.gz and b/dyninst-13.0.0.tar.gz differ diff --git a/dyninst-eliminate-deprecated-C-function-objects-1331.patch b/dyninst-eliminate-deprecated-C-function-objects-1331.patch deleted file mode 100644 index e7af8f7ce1c9c4fc26dd413b658a19b5e0132689..0000000000000000000000000000000000000000 --- a/dyninst-eliminate-deprecated-C-function-objects-1331.patch +++ /dev/null @@ -1,265 +0,0 @@ -From 6436c734eef50d55ed6c562aa3fabf0c7039c50c Mon Sep 17 00:00:00 2001 -From: "James A. Kupsch" -Date: Wed, 7 Dec 2022 13:28:08 -0600 -Subject: [PATCH] eliminate deprecated C++ function objects (#1331) - -fix function objects that were deprecate in C++ 11 and removed in C++ 17 - -- replace mem_fun with mem_fn -- eliminate binary_function and unary_function base classes -- use const iterator when constructing boost::transform_iterator ---- - dyninstAPI/h/BPatch_basicBlock.h | 4 +++- - dyninstAPI/src/StackMod/StackLocation.h | 5 +++-- - dyninstAPI/src/addressSpace.C | 10 +++++----- - .../AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C | 2 +- - .../src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C | 4 ++-- - instructionAPI/src/InstructionDecoder-aarch64.C | 2 +- - instructionAPI/src/InstructionDecoder-power.C | 6 +++--- - symtabAPI/h/Aggregate.h | 2 +- - symtabAPI/src/Aggregate.C | 12 ++++++------ - symtabAPI/src/Object-elf.C | 4 ++-- - 10 files changed, 27 insertions(+), 24 deletions(-) - -diff --git a/dyninstAPI/h/BPatch_basicBlock.h b/dyninstAPI/h/BPatch_basicBlock.h -index 37547d40c..de26fd81f 100644 ---- a/dyninstAPI/h/BPatch_basicBlock.h -+++ b/dyninstAPI/h/BPatch_basicBlock.h -@@ -89,8 +89,10 @@ struct comparison { - */ - class BPatch_flowGraph; - --struct BPATCH_DLL_EXPORT insnPredicate : public std::unary_function -+struct BPATCH_DLL_EXPORT insnPredicate - { -+ using result_type = bool; -+ using argument_type = Dyninst::InstructionAPI::Instruction; - virtual result_type operator()(argument_type arg) = 0; - virtual ~insnPredicate() {} - -diff --git a/dyninstAPI/src/StackMod/StackLocation.h b/dyninstAPI/src/StackMod/StackLocation.h -index 4b1d731e6..51775e261 100644 ---- a/dyninstAPI/src/StackMod/StackLocation.h -+++ b/dyninstAPI/src/StackMod/StackLocation.h -@@ -132,7 +132,8 @@ class StackLocation { - ValidPCRange* _valid; - }; - --struct less_StackLocation: public std::binary_function { -+struct less_StackLocation -+{ - bool operator()(StackLocation* a, StackLocation* b) const { - if (a->isStackMemory() && b->isStackMemory()) { - if (a->off().height() == b->off().height()) { -@@ -178,7 +179,7 @@ class tmpObject - ValidPCRange* _valid; - }; - --struct less_tmpObject: public std::binary_function -+struct less_tmpObject - { - bool operator()(tmpObject a, tmpObject b) const { - if (a.offset() < b.offset()) { -diff --git a/dyninstAPI/src/addressSpace.C b/dyninstAPI/src/addressSpace.C -index 3b4cf9eba..8978262f6 100644 ---- a/dyninstAPI/src/addressSpace.C -+++ b/dyninstAPI/src/addressSpace.C -@@ -284,7 +284,7 @@ void AddressSpace::inferiorFreeCompact() { - unsigned i, nbuf = freeList.size(); - - /* sort buffers by address */ -- std::sort(freeList.begin(), freeList.end(), ptr_fun(heapItemLessByAddr)); -+ std::sort(freeList.begin(), freeList.end(), heapItemLessByAddr); - - /* combine adjacent buffers */ - bool needToCompact = false; -@@ -371,7 +371,7 @@ void AddressSpace::addHeap(heapItem *h) { - heap_.heapFree.push_back(h2); - - /* When we add an item to heapFree, make sure it remains in sorted order */ -- std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), ptr_fun(heapItemLessByAddr)); -+ std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), heapItemLessByAddr); - - heap_.totalFreeMemAvailable += h2->length; - } -@@ -425,7 +425,7 @@ Address AddressSpace::inferiorMallocInternal(unsigned size, - } - - /* When we update an item in heapFree, make sure it remains in sorted order */ -- std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), ptr_fun(heapItemLessByAddr)); -+ std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), heapItemLessByAddr); - - // add allocated block to active list - h->length = size; -@@ -455,7 +455,7 @@ void AddressSpace::inferiorFreeInternal(Address block) { - heap_.heapFree.push_back(h); - - /* When we add an item to heapFree, make sure it remains in sorted order */ -- std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), ptr_fun(heapItemLessByAddr)); -+ std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), heapItemLessByAddr); - - heap_.totalFreeMemAvailable += h->length; - heap_.freed += h->length; -@@ -561,7 +561,7 @@ bool AddressSpace::inferiorShrinkBlock(heapItem *h, - heap_.heapFree.push_back(freeEnd); - - /* When we add an item to heapFree, make sure it remains sorted */ -- std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), ptr_fun(heapItemLessByAddr)); -+ std::sort(heap_.heapFree.begin(), heap_.heapFree.end(), heapItemLessByAddr); - } - - heap_.totalFreeMemAvailable += shrink; -diff --git a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -index f62b1f546..daf7a4b7d 100644 ---- a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -+++ b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -@@ -235,7 +235,7 @@ namespace Dyninst { - mainDecode(); - if(entryToCategory(insn_in_progress->getOperation().getID())==c_BranchInsn){ - //cout << "Is Branch Instruction !! , name = " << insn_in_progress -> getOperation().mnemonic << endl; -- //std::mem_fun(decode_lookup_table[instr_family])(this); -+ //std::mem_fn(decode_lookup_table[instr_family])(this); - } - b.start += insn_in_progress->size(); - return *insn_in_progress; -diff --git a/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C b/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -index 3093ece41..ed7cbed78 100644 ---- a/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -+++ b/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -@@ -552,7 +552,7 @@ namespace Dyninst { - bool InstructionDecoder_amdgpu_vega::decodeOperands(const amdgpu_vega_insn_entry & insn_entry) { - if(insn_entry.operandCnt!=0){ - for (std::size_t i =0 ; i < insn_entry.operandCnt; i++){ -- std::mem_fun(insn_entry.operands[i])(this); -+ std::mem_fn(insn_entry.operands[i])(this); - } - } - return true; -@@ -721,7 +721,7 @@ namespace Dyninst { - setupInsnWord(b); - mainDecodeOpcode(b); - if(entryToCategory(insn_in_progress->getOperation().getID())==c_BranchInsn){ -- std::mem_fun(decode_lookup_table[instr_family])(this); -+ std::mem_fn(decode_lookup_table[instr_family])(this); - } - b.start += insn_in_progress->size(); - return *insn_in_progress; -diff --git a/instructionAPI/src/InstructionDecoder-aarch64.C b/instructionAPI/src/InstructionDecoder-aarch64.C -index 53a831c3c..2e8935923 100644 ---- a/instructionAPI/src/InstructionDecoder-aarch64.C -+++ b/instructionAPI/src/InstructionDecoder-aarch64.C -@@ -2960,7 +2960,7 @@ Expression::Ptr InstructionDecoder_aarch64::makeMemRefExPair2(){ - skipRm = true; - - for (std::size_t i = 0; i < insn_table_entry.operandCnt; i++) { -- std::mem_fun(insn_table_entry.operands[i])(this); -+ std::mem_fn(insn_table_entry.operands[i])(this); - } - - if (insn_table_index == 0) -diff --git a/instructionAPI/src/InstructionDecoder-power.C b/instructionAPI/src/InstructionDecoder-power.C -index ffd38bcf3..34b903d11 100644 ---- a/instructionAPI/src/InstructionDecoder-power.C -+++ b/instructionAPI/src/InstructionDecoder-power.C -@@ -297,7 +297,7 @@ namespace Dyninst - const power_entry* current = &power_entry::main_opcode_table[field<0,5>(insn)]; - while(current->next_table) - { -- current = &(std::mem_fun(current->next_table)(this)); -+ current = &(std::mem_fn(current->next_table)(this)); - } - if (findRAAndRS(current)) { - isRAWritten = true; -@@ -314,7 +314,7 @@ namespace Dyninst - curFn != current->operands.end(); - ++curFn) - { -- std::mem_fun(*curFn)(this); -+ std::mem_fn(*curFn)(this); - } - if(current->op == power_op_bclr) - { -@@ -1429,7 +1429,7 @@ using namespace boost::assign; - const power_entry* current = &power_entry::main_opcode_table[field<0,5>(insn)]; - while(current->next_table) - { -- current = &(std::mem_fun(current->next_table)(this)); -+ current = &(std::mem_fn(current->next_table)(this)); - } - insn_in_progress = makeInstruction(current->op, current->mnemonic, 4, reinterpret_cast(&insn)); - if(current->op == power_op_b || -diff --git a/symtabAPI/h/Aggregate.h b/symtabAPI/h/Aggregate.h -index bcc930252..80caeb34b 100644 ---- a/symtabAPI/h/Aggregate.h -+++ b/symtabAPI/h/Aggregate.h -@@ -86,7 +86,7 @@ class SYMTAB_EXPORT Aggregate - //std::vector getAllMangledNames(); - //std::vector getAllPrettyNames(); - //std::vector getAllTypedNames(); -- typedef boost::transform_iterator, std::vector::const_iterator> name_iter; -+ using name_iter = boost::transform_iterator::const_iterator>; - name_iter mangled_names_begin() const; - name_iter mangled_names_end() const; - name_iter pretty_names_begin() const; -diff --git a/symtabAPI/src/Aggregate.C b/symtabAPI/src/Aggregate.C -index 2fc69358d..f0de0b841 100644 ---- a/symtabAPI/src/Aggregate.C -+++ b/symtabAPI/src/Aggregate.C -@@ -307,26 +307,26 @@ bool Aggregate::operator==(const Aggregate &a) - - Aggregate::name_iter Aggregate::mangled_names_begin() const - { -- return boost::make_transform_iterator(symbols_.begin(), std::mem_fun(&Symbol::getMangledName)); -+ return boost::make_transform_iterator(symbols_.cbegin(), std::mem_fn(&Symbol::getMangledName)); - } - - Aggregate::name_iter Aggregate::mangled_names_end() const - { -- return boost::make_transform_iterator(symbols_.end(), std::mem_fun(&Symbol::getMangledName)); -+ return boost::make_transform_iterator(symbols_.cend(), std::mem_fn(&Symbol::getMangledName)); - } - Aggregate::name_iter Aggregate::pretty_names_begin() const - { -- return boost::make_transform_iterator(symbols_.begin(), std::mem_fun(&Symbol::getPrettyName)); -+ return boost::make_transform_iterator(symbols_.cbegin(), std::mem_fn(&Symbol::getPrettyName)); - } - Aggregate::name_iter Aggregate::pretty_names_end() const - { -- return boost::make_transform_iterator(symbols_.end(), std::mem_fun(&Symbol::getPrettyName)); -+ return boost::make_transform_iterator(symbols_.cend(), std::mem_fn(&Symbol::getPrettyName)); - } - Aggregate::name_iter Aggregate::typed_names_begin() const - { -- return boost::make_transform_iterator(symbols_.begin(), std::mem_fun(&Symbol::getTypedName)); -+ return boost::make_transform_iterator(symbols_.cbegin(), std::mem_fn(&Symbol::getTypedName)); - } - Aggregate::name_iter Aggregate::typed_names_end() const - { -- return boost::make_transform_iterator(symbols_.end(), std::mem_fun(&Symbol::getTypedName)); -+ return boost::make_transform_iterator(symbols_.cend(), std::mem_fn(&Symbol::getTypedName)); - } -diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C -index 9eb7a1dc8..4e73e7a13 100644 ---- a/symtabAPI/src/Object-elf.C -+++ b/symtabAPI/src/Object-elf.C -@@ -129,7 +129,7 @@ const char *pdelf_get_shnames(Elf_X *elf) { - // - // Compare function for use with the Vector sort method. - // --struct SectionHeaderSortFunction : public binary_function { -+struct SectionHeaderSortFunction { - bool operator()(Elf_X_Shdr *hdr1, Elf_X_Shdr *hdr2) { - return (hdr1->sh_addr() < hdr2->sh_addr()); - } -@@ -3122,7 +3122,7 @@ int read_except_table_gcc3( - } - - --struct exception_compare : public binary_function { -+struct exception_compare { - bool operator()(const ExceptionBlock &e1, const ExceptionBlock &e2) const { - if (e1.tryStart() < e2.tryStart()) - return true; --- -2.33.0 - diff --git a/dyninst-support-clang-build.patch b/dyninst-support-clang-build.patch deleted file mode 100644 index 62338a5943cac6696f753ff986ad57f6c923b10b..0000000000000000000000000000000000000000 --- a/dyninst-support-clang-build.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 6644c84edd08305f0305a1aaea20797cb01cb197 Mon Sep 17 00:00:00 2001 -From: luofeng -Date: Sat, 23 Sep 2023 10:17:45 +0800 -Subject: [PATCH] support clang build - ---- - cmake/options.cmake | 3 ++- - .../src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C | 4 ++-- - .../src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.h | 2 +- - .../src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.C | 2 +- - .../src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.h | 2 +- - .../src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C | 4 ++-- - 6 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/cmake/options.cmake b/cmake/options.cmake -index 7cbe66b..0481463 100644 ---- a/cmake/options.cmake -+++ b/cmake/options.cmake -@@ -1,5 +1,6 @@ - # Use OpenMP? --option(USE_OpenMP "Use OpenMP for parallel parsing" ON) -+# option(USE_OpenMP "Use OpenMP for parallel parsing" ON) -+option(USE_OpenMP "Use OpenMP for parallel parsing" OFF) - - # Use SymtabAPI or SymLite? - option( -diff --git a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -index daf7a4b..66b4a3a 100644 ---- a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -+++ b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.C -@@ -162,7 +162,7 @@ namespace Dyninst { - Expression::Ptr InstructionDecoder_amdgpu_cdna2::decodeOPR_WAITCNT(uint64_t input){ - return Immediate::makeImmediate(Result(s16, input)); - } -- Expression::Ptr InstructionDecoder_amdgpu_cdna2::makeRegisterExpression(MachRegister registerID){ -+ Expression::Ptr InstructionDecoder_amdgpu_cdna2::makeRegisterExpression(MachRegister registerID, uint32_t){ - if(registerID == amdgpu_cdna2::src_literal){ - return Immediate::makeImmediate(Result(u32,decodeOPR_LITERAL())); - } -@@ -235,7 +235,7 @@ namespace Dyninst { - mainDecode(); - if(entryToCategory(insn_in_progress->getOperation().getID())==c_BranchInsn){ - //cout << "Is Branch Instruction !! , name = " << insn_in_progress -> getOperation().mnemonic << endl; -- //std::mem_fn(decode_lookup_table[instr_family])(this); -+ //std::mem_fun(decode_lookup_table[instr_family])(this); - } - b.start += insn_in_progress->size(); - return *insn_in_progress; -diff --git a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.h b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.h -index d35482f..f194ac4 100644 ---- a/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.h -+++ b/instructionAPI/src/AMDGPU/cdna2/InstructionDecoder-amdgpu-cdna2.h -@@ -306,7 +306,7 @@ namespace Dyninst { - Expression::Ptr decodeOPR_SIMM32(uint64_t input); - Expression::Ptr decodeOPR_WAITCNT(uint64_t input); - using InstructionDecoderImpl::makeRegisterExpression; -- Expression::Ptr makeRegisterExpression(MachRegister registerID); -+ Expression::Ptr makeRegisterExpression(MachRegister registerID, uint32_t num_elements = 1); - Expression::Ptr makeRegisterExpression(MachRegister registerID, uint32_t low , uint32_t high ); - void specialHandle(); - #include "amdgpu_cdna2_decoder_impl.h" -diff --git a/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.C b/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.C -index 70d9edc..a629b3c 100644 ---- a/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.C -+++ b/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.C -@@ -178,7 +178,7 @@ namespace Dyninst { - Expression::Ptr InstructionDecoder_amdgpu_gfx908::decodeOPR_WAITCNT(uint64_t input){ - return Immediate::makeImmediate(Result(s16, input)); - } -- Expression::Ptr InstructionDecoder_amdgpu_gfx908::makeRegisterExpression(MachRegister registerID){ -+ Expression::Ptr InstructionDecoder_amdgpu_gfx908::makeRegisterExpression(MachRegister registerID, uint32_t){ - if(registerID == amdgpu_gfx908::src_literal){ - return Immediate::makeImmediate(Result(u32,decodeOPR_LITERAL())); - } -diff --git a/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.h b/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.h -index 7826af0..b5420d8 100644 ---- a/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.h -+++ b/instructionAPI/src/AMDGPU/gfx908/InstructionDecoder-amdgpu-gfx908.h -@@ -299,7 +299,7 @@ namespace Dyninst { - Expression::Ptr decodeOPR_SIMM32(uint64_t input); - Expression::Ptr decodeOPR_WAITCNT(uint64_t input); - using InstructionDecoderImpl::makeRegisterExpression; -- Expression::Ptr makeRegisterExpression(MachRegister registerID); -+ Expression::Ptr makeRegisterExpression(MachRegister registerID, uint32_t num_elements = 1); - Expression::Ptr makeRegisterExpression(MachRegister registerID, uint32_t low , uint32_t high ); - void specialHandle(); - #include "amdgpu_gfx908_decoder_impl.h" -diff --git a/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C b/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -index ed7cbed..3093ece 100644 ---- a/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -+++ b/instructionAPI/src/AMDGPU/vega/InstructionDecoder-amdgpu-vega.C -@@ -552,7 +552,7 @@ namespace Dyninst { - bool InstructionDecoder_amdgpu_vega::decodeOperands(const amdgpu_vega_insn_entry & insn_entry) { - if(insn_entry.operandCnt!=0){ - for (std::size_t i =0 ; i < insn_entry.operandCnt; i++){ -- std::mem_fn(insn_entry.operands[i])(this); -+ std::mem_fun(insn_entry.operands[i])(this); - } - } - return true; -@@ -721,7 +721,7 @@ namespace Dyninst { - setupInsnWord(b); - mainDecodeOpcode(b); - if(entryToCategory(insn_in_progress->getOperation().getID())==c_BranchInsn){ -- std::mem_fn(decode_lookup_table[instr_family])(this); -+ std::mem_fun(decode_lookup_table[instr_family])(this); - } - b.start += insn_in_progress->size(); - return *insn_in_progress; --- -2.19.1 - diff --git a/dyninst-warning-fix-std-iterator-is-deprecated-1394.patch b/dyninst-warning-fix-std-iterator-is-deprecated-1394.patch deleted file mode 100644 index 15ff5ae20557b8190d4999d3abc4b636c1054896..0000000000000000000000000000000000000000 --- a/dyninst-warning-fix-std-iterator-is-deprecated-1394.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 55d8a338e362d3aa4448aa9bae776eb90ca1292a Mon Sep 17 00:00:00 2001 -From: "James A. Kupsch" -Date: Thu, 16 Feb 2023 10:11:59 -0600 -Subject: [PATCH] warning fix: std::iterator is deprecated (#1394) - -- replace std::iterator with in class type aliass for required types ---- - symtabAPI/h/Symtab.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/symtabAPI/h/Symtab.h b/symtabAPI/h/Symtab.h -index 7731c1572..bf6d8ab23 100644 ---- a/symtabAPI/h/Symtab.h -+++ b/symtabAPI/h/Symtab.h -@@ -558,9 +558,15 @@ class SYMTAB_EXPORT Symtab : public LookupInterface, - void erase(Symbol* s); - - // Iterator for the symbols. Do not use in parallel. -- class iterator : public std::iterator { -+ class iterator { - master_t::iterator m; - public: -+ using iterator_category = std::forward_iterator_tag; -+ using value_type = Symbol*; -+ using difference_type = std::ptrdiff_t; -+ using pointer = value_type*; -+ using reference = value_type&; -+ - iterator(master_t::iterator i) : m(i) {} - bool operator==(const iterator& x) { return m == x.m; } - bool operator!=(const iterator& x) { return !operator==(x); } --- -2.21.0.windows.1 - diff --git a/dyninst.spec b/dyninst.spec index 70ccde21c9b8b5aa2417d4c042f30b2f9d2e742c..4f7489a25d3b4ab5d3dbe6d4a12a65dc35c0309b 100644 --- a/dyninst.spec +++ b/dyninst.spec @@ -1,7 +1,7 @@ Name: dyninst License: LGPLv2+ -Release: 7 -Version: 12.3.0 +Release: 1 +Version: 13.0.0 Summary: An API for Run-time Code Generation ExclusiveArch: x86_64 aarch64 @@ -13,11 +13,6 @@ URL: http://www.dyninst.org Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz Source1: https://github.com/dyninst/testsuite/archive/v%{testsuite_version}/%{testsuite_base}.tar.gz -Patch1: dyninst-eliminate-deprecated-C-function-objects-1331.patch -Patch2: dyninst-warning-fix-std-iterator-is-deprecated-1394.patch -Patch3: dyninst-support-clang-build.patch -Patch4: Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch - BuildRequires: cmake gcc-c++ BuildRequires: binutils-devel boost-devel BuildRequires: elfutils-libelf-devel @@ -49,15 +44,11 @@ dyninst-devel includes the C header files and libraries. %setup -q -n %{name}-%{version} -c %setup -q -T -D -a 1 -pushd %{dyninst_base} -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 -popd +cd %{dyninst_base} -sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \ - %{dyninst_base}/cmake/shared.cmake +# 移除或修正 sed 命令，确保其操作的文件存在 +# sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \ +# %{dyninst_base}/cmake/shared.cmake %build cd %{dyninst_base} @@ -79,7 +70,8 @@ export CFLAGS CXXFLAGS LDFLAGS DESTDIR="../install" %__cmake --install "%{__cmake_builddir}" find ../install -name '*.cmake' -execdir \ sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+' -sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake +# 移除或修正 sed 命令，确保其操作的文件存在 +# sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake %install cd %{dyninst_base} @@ -124,6 +116,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %doc %{dyninst_base}/symtabAPI/doc/symtabAPI.pdf %changelog +* Thu Jun 19 2025 openeuler_bot - 13.0.0-1 +- update dyninst to 13.0.0 + * Mon Dec 16 2024 wangxiao - 12.3.0-7 - adapt to new cmake macro @@ -167,4 +162,4 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf - update to 10.1.0 * Mon Feb 24 2020 openEuler Buildteam - 9.3.2-13 -- Package init +- Package init \ No newline at end of file