diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2016-03-20 20:14:34 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2016-03-20 20:14:34 +0300 |
| commit | 8082ba7028491049b5b6deccede5e80b8c7fdfc1 (patch) | |
| tree | 49b5600da71ad58c84f52921ba78960ee1be02d6 /dev-util/oprofile/files | |
| parent | kde-frameworks: version bump 5.20 (diff) | |
| download | gentoo-8082ba7028491049b5b6deccede5e80b8c7fdfc1.tar.gz gentoo-8082ba7028491049b5b6deccede5e80b8c7fdfc1.tar.bz2 gentoo-8082ba7028491049b5b6deccede5e80b8c7fdfc1.zip | |
Revert "dev-util/oprofile: remove old version"
This reverts commit 331e1e47a803fcc79d9e66ae54db9c364a8f1af9, which
accidentally removed patch used by 0.9.9-r2
(oprofile-1.0.0-athlon.patch).
Diffstat (limited to 'dev-util/oprofile/files')
| -rw-r--r-- | dev-util/oprofile/files/oprofile-1.0.0-athlon.patch | 20 | ||||
| -rw-r--r-- | dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch new file mode 100644 index 000000000000..5916271b3a00 --- /dev/null +++ b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch @@ -0,0 +1,20 @@ +Fix AMD Athlon CPU family recognition. +See upstream bug 275 for details: +https://sourceforge.net/p/oprofile/bugs/275/ +--- oprofile-1.0.0/libop/op_cpu_type.c.orig 2014-09-12 18:39:47.000000000 +0400 ++++ oprofile-1.0.0/libop/op_cpu_type.c 2014-11-30 18:29:00.328342552 +0300 +@@ -538,10 +538,13 @@ + family = cpu_family(eax); + + /* These family does not exist in the past.*/ +- if (family < 0x0f || family == 0x13) ++ if ((family < 0x0f && family != 0x06) || family == 0x13) + return ret; + + switch (family) { ++ case 0x6: ++ ret = op_get_cpu_number("i386/athlon"); ++ break; + case 0x0f: + ret = op_get_cpu_number("x86-64/hammer"); + break; diff --git a/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch new file mode 100644 index 000000000000..2943a074f5ef --- /dev/null +++ b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch @@ -0,0 +1,11 @@ +--- a/opjitconv/opjitconv.c ++++ b/opjitconv/opjitconv.c +@@ -216,7 +216,7 @@ + int file_locked = 0; + unsigned int usecs_waited = 0; + int rc = OP_JIT_CONV_OK; +- int fd = open(dumpfile, S_IRUSR); ++ int fd = open(dumpfile, O_RDONLY); + if (fd < 0) { + perror("opjitconv failed to open JIT dumpfile"); + return OP_JIT_CONV_FAIL; |