From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 package/devel/oprofile/patches/100-musl.patch      | 39 ++++++++++++++++++++++
 .../oprofile/patches/200-add_mips_1004kc.patch     | 10 ++++++
 2 files changed, 49 insertions(+)
 create mode 100644 package/devel/oprofile/patches/100-musl.patch
 create mode 100644 package/devel/oprofile/patches/200-add_mips_1004kc.patch

(limited to 'package/devel/oprofile/patches')

diff --git a/package/devel/oprofile/patches/100-musl.patch b/package/devel/oprofile/patches/100-musl.patch
new file mode 100644
index 0000000..05a5283
--- /dev/null
+++ b/package/devel/oprofile/patches/100-musl.patch
@@ -0,0 +1,39 @@
+--- a/pe_profiling/operf.cpp
++++ b/pe_profiling/operf.cpp
+@@ -857,11 +857,14 @@ static int __delete_old_previous_sample_
+                                 int tflag  __attribute__((unused)),
+                                 struct FTW *ftwbuf __attribute__((unused)))
+ {
++	int err;
++
+ 	if (remove(fpath)) {
++		err = errno;
+ 		perror("sample data removal error");
+-		return FTW_STOP;
++		return err;
+ 	} else {
+-		return FTW_CONTINUE;
++		return 0;
+ 	}
+ }
+ 
+@@ -896,7 +899,7 @@ static void convert_sample_data(void)
+ 		return;
+ 
+ 	if (!operf_options::append) {
+-                int flags = FTW_DEPTH | FTW_ACTIONRETVAL;
++                int flags = FTW_DEPTH;
+ 		errno = 0;
+ 		if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 &&
+ 				errno != ENOENT) {
+--- a/libop/op_events.c
++++ b/libop/op_events.c
+@@ -83,7 +83,7 @@ static int parse_hex(char const * str)
+ static u64 parse_long_hex(char const * str)
+ {
+ 	u64 value;
+-	if (sscanf(str, "%Lx", &value) != 1)
++	if (sscanf(str, "0x%llx", &value) != 1)
+ 		parse_error("expected long hexadecimal value");
+ 
+ 	fflush(stderr);
diff --git a/package/devel/oprofile/patches/200-add_mips_1004kc.patch b/package/devel/oprofile/patches/200-add_mips_1004kc.patch
new file mode 100644
index 0000000..038cd7d
--- /dev/null
+++ b/package/devel/oprofile/patches/200-add_mips_1004kc.patch
@@ -0,0 +1,10 @@
+--- a/libop/op_cpu_type.c
++++ b/libop/op_cpu_type.c
+@@ -609,6 +609,7 @@ static struct mips_cpu_descr mips_cpu_de
+ 	{ .key = "MIPS 25Kc", .value = "mips/25K" },		/* CPU_25KF */
+ 	{ .key = "MIPS 34Kc", .value = "mips/34K" },		/* CPU_34K */
+ 	{ .key = "MIPS 74Kc", .value = "mips/74K" },		/* CPU_74K */
++	{ .key = "MIPS 1004Kc", .value = "mips/1004K" },	/* CPU_1004K */
+ 	{ .key = "MIPS M14Kc", .value = "mips/M14Kc" },		/* CPU_M14KC */
+ 	{ .key = "RM9000", .value = "mips/rm9000" },		/* CPU_RM9000 */
+ 	{ .key = "R10000", .value = "mips/r10000" }, 		/* CPU_R10000 */
-- 
cgit v1.2.3