Message ID | 45e1aaa4574b61da7e3b31d612d89c61f02cc19a.1368603796.git.christian.braunersorensen@prevas.dk |
---|---|
State | Accepted |
Delegated to: | Esben Haabendal |
Headers | show |
<christian.braunersorensen@prevas.dk> writes: > From: Christian Sørensen <christian.braunersorensen@prevas.dk> > > --- > .../crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch | 2 +- > recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to 3.3 branch. /Esben
diff --git a/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch b/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch index bd0c60a..e67ffd1 100644 --- a/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch +++ b/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch @@ -9,7 +9,7 @@ + const int func_id) + { + int ret; -+- ++- ++ if(NULL==pnt) ++ return FREE_NOERROR; ++ diff --git a/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch b/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch index 3ffebdf..86d7d40 100644 --- a/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch +++ b/recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch @@ -11,5 +11,5 @@ diff -urN crosstool-ng-1.17.0~orig/patches/dmalloc/5.5.2/131-powerpc.patch cross +- asm("stw 0,%0" : "=g" (file)); \ ++ asm("mflr %0" : "=g" (file)); \ + } while(0) -+ ++ + #endif /* __powerpc__ && __GNUC__ && !__OPTIMIZE__ */
From: Christian Sørensen <christian.braunersorensen@prevas.dk> --- .../crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-fix-recursion.patch | 2 +- recipes/crosstool-ng/crosstool-ng-1.17.0/dmalloc-5.5.2-powerpc.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)