The branch, stable has been updated
via 70531ab42c0b1927a2f4c204dc4d499dace34a19 (commit)
via 9263871a0959d09287000f07def97a323cafa23d (commit)
from 3ee9927c327f1822b3be3c4cc3a2e1065d3f0a3b (commit)
- Shortlog ------------------------------------------------------------
70531ab Dpkg::Shlibs::SymbolFile: add many armel-specific symbols to the
blacklist
9263871 Dpkg::Shlibs::SymbolFile: handles multiple #include of the same file
Summary of changes:
ChangeLog | 10 ++++++++++
debian/changelog | 9 +++++++++
scripts/Dpkg/Shlibs/SymbolFile.pm | 10 ++++++++++
3 files changed, 29 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 70531ab42c0b1927a2f4c204dc4d499dace34a19
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Jan 24 12:21:25 2008 +0100
Dpkg::Shlibs::SymbolFile: add many armel-specific symbols to the blacklist
diff --git a/ChangeLog b/ChangeLog
index 9a39fed..71b0d64 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 <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.16.4.
diff --git a/debian/changelog b/debian/changelog
index 0fe0f3c..2625b8c 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 <[EMAIL PROTECTED]> Thu, 24 Jan 2008 11:27:05 +0100
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm
b/scripts/Dpkg/Shlibs/SymbolFile.pm
index 74c2639..7e076b8 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;
commit 9263871a0959d09287000f07def97a323cafa23d
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Jan 24 11:32:54 2008 +0100
Dpkg::Shlibs::SymbolFile: handles multiple #include of the same file
* scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file
from the %$seen hash at the end so that it's possible to include
multiple times the same file (at the same level and not from any
nested file obviously).
diff --git a/ChangeLog b/ChangeLog
index 11b7ee0..9a39fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file
+ from the %$seen hash at the end so that it's possible to include
+ multiple times the same file (at the same level and not from any
+ nested file obviously).
+
2008-01-23 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.16.4.
diff --git a/debian/changelog b/debian/changelog
index b84e2da..0fe0f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Thu, 24 Jan 2008 11:27:05 +0100
+
dpkg (1.14.16.4) unstable; urgency=low
* Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm
b/scripts/Dpkg/Shlibs/SymbolFile.pm
index a4c2295..74c2639 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -158,6 +158,7 @@ sub load {
}
}
close($sym_file);
+ delete $seen->{$file};
}
sub save {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
