From 70531ab42c0b1927a2f4c204dc4d499dace34a19 Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Thu, 24 Jan 2008 12:21:25 +0100 Subject: [PATCH] Dpkg::Shlibs::SymbolFile: add many armel-specific symbols to the blacklist --- ChangeLog | 3 +++ debian/changelog | 2 ++ scripts/Dpkg/Shlibs/SymbolFile.pm | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9a39fedb..71b0d646 100644 --- 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 * configure.ac: Release 1.14.16.4. diff --git a/debian/changelog b/debian/changelog index 0fe0f3cd..2625b8ce 100644 --- 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 Thu, 24 Jan 2008 11:27:05 +0100 diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm index 74c2639d..7e076b81 100644 --- 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; -- 2.39.5