summaryrefslogtreecommitdiff
path: root/patches/dmalloc
diff options
context:
space:
mode:
authorDmitry Pankratov <dp@ubiquitech.com>2016-06-18 14:02:15 (GMT)
committerDmitry Pankratov <dp@ubiquitech.com>2016-06-18 14:02:15 (GMT)
commit91b8280e8c9458e81fc94d1f9983f2a642ebb7a8 (patch)
tree9279482c6f4e8a28420c2f1adf19dcb084dc9f04 /patches/dmalloc
parentf6d8dc44111c6e96706eed8b0ae0483e2fb63856 (diff)
parent6e7c61650a39a67ee02ed58c11d64c94c436bb33 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'patches/dmalloc')
-rw-r--r--patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch b/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch
new file mode 100644
index 0000000..d92bd8a
--- /dev/null
+++ b/patches/dmalloc/5.5.2/170-ppc-bogus-assembly.patch
@@ -0,0 +1,13 @@
+diff -ur dmalloc-5.5.2.orig/return.h dmalloc-5.5.2/return.h
+--- dmalloc-5.5.2.orig/return.h 2016-03-13 13:11:48.090431764 -0700
++++ dmalloc-5.5.2/return.h 2016-03-13 13:12:11.246642618 -0700
+@@ -251,8 +251,7 @@
+
+ #define GET_RET_ADDR(file) \
+ do { \
+- asm("mflr 0"); \
+- asm("stw 0,%0" : "=g" (file)); \
++ asm("mflr %0" : "=r"(file)); \
+ } while(0)
+
+ #endif /* __powerpc__ && __GNUC__ && !__OPTIMIZE__ */