summaryrefslogtreecommitdiffstats
path: root/patches/failmalloc-1.0
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-11-23 13:58:17 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-11-23 13:58:17 +0100
commitd25fc05cff841bcfdd45d218a14eed16fd0fcd6c (patch)
tree41b4158afe0f215f4f3e3e4a5883e292e34aa2a9 /patches/failmalloc-1.0
parent56d1a2e8e189ecb249c93d551927b208c97e1d79 (diff)
downloadptxdist-d25fc05cff841bcfdd45d218a14eed16fd0fcd6c.tar.gz
ptxdist-d25fc05cff841bcfdd45d218a14eed16fd0fcd6c.tar.xz
failmalloc: add patch for glibc-2.14.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/failmalloc-1.0')
-rw-r--r--patches/failmalloc-1.0/0001-fix-building-with-glibc-2.14.1.patch23
-rw-r--r--patches/failmalloc-1.0/series4
2 files changed, 27 insertions, 0 deletions
diff --git a/patches/failmalloc-1.0/0001-fix-building-with-glibc-2.14.1.patch b/patches/failmalloc-1.0/0001-fix-building-with-glibc-2.14.1.patch
new file mode 100644
index 000000000..54c8b568f
--- /dev/null
+++ b/patches/failmalloc-1.0/0001-fix-building-with-glibc-2.14.1.patch
@@ -0,0 +1,23 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 23 Nov 2011 13:56:05 +0100
+Subject: [PATCH] fix building with glibc-2.14.1
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ failmalloc.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/failmalloc.c b/failmalloc.c
+index fc33552..cecc7b5 100644
+--- a/failmalloc.c
++++ b/failmalloc.c
+@@ -204,5 +204,9 @@ failmalloc_init (void)
+ failmalloc_install ();
+ }
+
++#ifdef __MALLOC_HOOK_VOLATILE
++void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void) = failmalloc_init;
++#else
+ void (*__malloc_initialize_hook) (void) = failmalloc_init;
++#endif
+
diff --git a/patches/failmalloc-1.0/series b/patches/failmalloc-1.0/series
new file mode 100644
index 000000000..eda3da385
--- /dev/null
+++ b/patches/failmalloc-1.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-building-with-glibc-2.14.1.patch
+# 77ed858c96b7d3dc9f91cc361acc732c - git-ptx-patches magic