Explorar el Código

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

Raphael Hertzog hace 18 años
padre
commit
70531ab42c
Se han modificado 3 ficheros con 14 adiciones y 0 borrados
  1. 3 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 9 0
      scripts/Dpkg/Shlibs/SymbolFile.pm

+ 3 - 0
ChangeLog

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

+ 2 - 0
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
   * Fix dpkg-gensymbols handling of #include so that one can include multiple
     times the same file and have it properly taken into account.
     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
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 24 Jan 2008 11:27:05 +0100
 
 

+ 9 - 0
scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -60,6 +60,15 @@ for (my $i = 14; $i <= 31; $i++) {
     $blacklist{"_savegpr_$i"} = 1;
     $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 {
 sub new {
     my $this = shift;
     my $this = shift;
     my $file = shift;
     my $file = shift;