Dpkg::Shlibs::SymbolFile: add many armel-specific symbols to the blacklist

diff --git a/ChangeLog b/ChangeLog
index 9a39fedbac96746ad3e9d90ec6d1e1d3cdbf343a..71b0d64669e312c6a0d9039a8c4f5d787dc46b61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
        multiple times the same file (at the same level and not from any
        nested file obviously).
 
+       * scripts/Dpkg/Shlibs/SymbolFile.pm: Blacklist many armel specific
+       symbols.
+
 2008-01-23  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Release 1.14.16.4.

diff --git a/debian/changelog b/debian/changelog
index 0fe0f3cd325fb46b2605374abcd7f67ea1e98886..2625b8ced7de48b4c3c44a5444ca1443a2e9aa7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dpkg (1.14.16.5) UNRELEASED; urgency=low
 
   * Fix dpkg-gensymbols handling of #include so that one can include multiple
     times the same file and have it properly taken into account.
+  * Add many armel-specific symbols to dpkg-gensymbols' blacklist.
+    Closes: #462318
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 24 Jan 2008 11:27:05 +0100
 

diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index 74c2639d2a7431b1f693a2920be8e485fc6d5fa2..7e076b81fd605b8f97839e62ca1f6b80d7cfc6e2 100644 (file)
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -60,6 +60,15 @@ for (my $i = 14; $i <= 31; $i++) {
     $blacklist{"_savegpr_$i"} = 1;
 }
 
+# Many armel-specific symbols
+$blacklist{"__aeabi_$_"} = 1 foreach (qw(cdcmpeq cdcmple cdrcmple cfcmpeq
+cfcmple cfrcmple d2f d2iz d2lz d2uiz d2ulz dadd dcmpeq dcmpge dcmpgt
+dcmple dcmplt dcmpun ddiv dmul dneg drsub dsub f2d f2iz f2lz f2uiz f2ulz
+fadd fcmpeq fcmpge fcmpgt fcmple fcmplt fcmpun fdiv fmul fneg frsub fsub
+i2d i2f idiv idivmod l2d l2f lasr lcmp ldivmod llsl llsr lmul ui2d ui2f
+uidiv uidivmod ul2d ul2f ulcmp uldivmod unwind_cpp_pr0 unwind_cpp_pr1
+unwind_cpp_pr2 uread4 uread8 uwrite4 uwrite8));
+
 sub new {
     my $this = shift;
     my $file = shift;