tags 455420 + patch thanks Hi,
Attached is the diff for my libpfm3-3.2 3.2.070507-1.1 NMU. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
diff -u libpfm3-3.2-3.2.070507/debian/changelog libpfm3-3.2-3.2.070507/debian/changelog
--- libpfm3-3.2-3.2.070507/debian/changelog
+++ libpfm3-3.2-3.2.070507/debian/changelog
@@ -1,3 +1,11 @@
+libpfm3-3.2 (3.2.070507-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3. Thanks to Maximiliano Curia for the patch.
+ (Closes: #455420)
+
+ -- James Vega <[EMAIL PROTECTED]> Sat, 22 Mar 2008 23:18:54 -0400
+
libpfm3-3.2 (3.2.070507-1) unstable; urgency=low
* New upstream.
only in patch2:
unchanged:
--- libpfm3-3.2-3.2.070507.orig/lib/pfmlib_pentium4.c
+++ libpfm3-3.2-3.2.070507/lib/pfmlib_pentium4.c
@@ -270,7 +270,7 @@
{
unsigned int assigned_pmcs[PENTIUM4_NUM_PMCS] = {0};
unsigned int event, event_mask, mask;
- unsigned int tag_value, tag_enable;
+ unsigned int bit, tag_value, tag_enable;
unsigned int plm;
unsigned int i, j, k, m, n;
int escr, escr_pmc;
@@ -361,13 +361,14 @@
tag_enable = 0;
for (n = 0; n < input->pfp_events[i].num_masks; n++) {
mask = input->pfp_events[i].unit_masks[n];
- if (mask < EVENT_MASK_BITS &&
- pentium4_events[event].event_masks[mask].name) {
- event_mask |= (1 << pentium4_events[event].event_masks[mask].bit);
+ bit = pentium4_events[event].event_masks[mask].bit;
+ if (bit < EVENT_MASK_BITS &&
+ pentium4_events[event].event_masks[mask].name) {
+ event_mask |= (1 << bit);
}
- if (mask >= EVENT_MASK_BITS &&
- pentium4_events[event].event_masks[mask].name) {
- tag_value |= (1 << (pentium4_events[event].event_masks[mask].bit - EVENT_MASK_BITS));
+ if (bit >= EVENT_MASK_BITS &&
+ pentium4_events[event].event_masks[mask].name) {
+ tag_value |= (1 << (bit - EVENT_MASK_BITS));
tag_enable = 1;
}
}
signature.asc
Description: Digital signature
