[dpkg] 146/200: Dpkg::Shlibs::Objdump: Mask ELF machine bits for SH and MIPS

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit 0cdf7ebbbf1dd8192dc3e8dfde70ec40685b1926
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Jan 27 23:03:29 2017 +0100

    Dpkg::Shlibs::Objdump: Mask ELF machine bits for SH and MIPS
    
    These do not define the ABI, and seem to be set depending on the ISA
    used. Mask them for now, and postpone possibly making more fine-grained
    matching in the future.
---
 debian/changelog               | 7 +++++++
 scripts/Dpkg/Shlibs/Objdump.pm | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7c0e08..df6141e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 dpkg (1.18.20) UNRELEASED; urgency=medium
 
+  [ Guillem Jover ]
+  * Perl modules:
+    - Mask the machine bits for SH and MIPS in the ELF processor flags in
+      Dpkg::Shlibs::Objdump. These do not define the ABI, and make the
+      objects not match when they should, when looking for shared libraries
+      from dpkg-shlibdeps.
+
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
 
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index 63b5825..519916d 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -133,10 +133,8 @@ my %elf_flags_mask = (
                            ELF_FLAG_ARM_NEW_ABI | ELF_FLAG_ARM_OLD_ABI |
                            ELF_FLAG_ARM_SOFT_FLOAT | ELF_FLAG_ARM_HARD_FLOAT,
     ELF_MACH_IA64()     => ELF_FLAG_IA64_ABI64,
-    ELF_MACH_MIPS()     => ELF_FLAG_MIPS_ARCH_MASK | ELF_FLAG_MIPS_ABI_MASK |
-                           ELF_FLAG_MIPS_ABI2,
+    ELF_MACH_MIPS()     => ELF_FLAG_MIPS_ABI_MASK | ELF_FLAG_MIPS_ABI2,
     ELF_MACH_PPC64()    => ELF_FLAG_PPC64_ABI64,
-    ELF_MACH_SH()       => ELF_FLAG_SH_MACH_MASK,
 );
 
 sub get_format {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git