commit c113bc9d9f43b2ab4e64c9052efdd4e7a84cc78e
author Ben Cheng <bccheng@google.com> Wed Nov 20 18:59:30 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 20 18:59:30 2013 +0000
tree 67d9b2a91b149df2389756c0226919953aac9e81
parent 24aa9a1a3d85bad3783b47c631c0baf21658ec42
parent 0cf1703b5ab7707d6a39e750b704138454849df0

Merge "Work around broken MIPS build"

perf-3.12.0/tools/perf/Android.mk

diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk
index c157536..5e39853 100644
--- a/perf-3.12.0/tools/perf/Android.mk
+++ b/perf-3.12.0/tools/perf/Android.mk
@@ -47,7 +47,6 @@
 	util/cgroup.c \
 	util/color.c \
 	util/config.c \
-	util/config.c \
 	util/cpumap.c \
 	util/ctype.c \
 	util/debug.c \

perf-3.12.0/tools/perf/arch/mips/util/dwarf-regs.c

diff --git a/perf-3.12.0/tools/perf/arch/mips/util/dwarf-regs.c b/perf-3.12.0/tools/perf/arch/mips/util/dwarf-regs.c
new file mode 100644
index 0000000..5e33dbc
--- /dev/null
+++ b/perf-3.12.0/tools/perf/arch/mips/util/dwarf-regs.c
@@ -0,0 +1,10 @@
+#include <stddef.h>
+#include <dwarf-regs.h>
+
+/* TODO */
+
+const char *get_arch_regstr(unsigned int n)
+{
+	perror("Need a real implementation for MIPS");
+	return NULL;
+}