summaryrefslogtreecommitdiff
path: root/java/cacao/files/patch-boehm-gc__dbg_ml.c
diff options
context:
space:
mode:
Diffstat (limited to 'java/cacao/files/patch-boehm-gc__dbg_ml.c')
-rw-r--r--java/cacao/files/patch-boehm-gc__dbg_ml.c76
1 files changed, 0 insertions, 76 deletions
diff --git a/java/cacao/files/patch-boehm-gc__dbg_ml.c b/java/cacao/files/patch-boehm-gc__dbg_ml.c
deleted file mode 100644
index 216ff347a3e2..000000000000
--- a/java/cacao/files/patch-boehm-gc__dbg_ml.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/mm/boehm-gc/dbg_mlc.c.orig 2012-09-03 12:10:00.000000000 -0400
-+++ src/mm/boehm-gc/dbg_mlc.c 2012-09-19 13:02:15.000000000 -0400
-@@ -466,10 +466,34 @@
- GC_register_displacement((word)sizeof(oh) + offset);
- }
-
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+static void GC_caller_func_offset(ad, symp, offp)
-+const GC_word ad;
-+const char **symp;
-+int *offp;
-+{
-+ Dl_info caller;
-+ if (dladdr((const void *)ad, &caller) && caller.dli_sname != NULL) {
-+ *symp = caller.dli_sname;
-+ *offp = (const char *)ad - (const char *)caller.dli_saddr;
-+ }
-+}
-+#else
-+#define GC_caller_func(ad, symp, offp)
-+#endif
-+
- GC_API void * GC_CALL GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
- {
- void * result = GC_malloc(lb + DEBUG_BYTES);
-
-+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (result == 0) {
- GC_err_printf("GC_debug_malloc(%lu) returning NIL (",
- (unsigned long) lb);
-@@ -792,6 +816,13 @@
- size_t old_sz;
- hdr * hhdr;
-
-+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
- base = GC_base(p);
- if (base == 0) {
-@@ -1098,17 +1129,21 @@
- }
-
- #ifdef GC_ADD_CALLER
--# define RA GC_RETURN_ADDR,
-+# ifdef GC_RETURN_ADDR_PARENT
-+# define RA GC_RETURN_ADDR_PARENT,
-+# else
-+# define RA GC_RETURN_ADDR,
-+# endif
- #else
- # define RA
- #endif
-
- GC_API void * GC_CALL GC_debug_malloc_replacement(size_t lb)
- {
-- return GC_debug_malloc(lb, RA "unknown", 0);
-+ return GC_debug_malloc(lb, RA NULL, 0);
- }
-
- GC_API void * GC_CALL GC_debug_realloc_replacement(void *p, size_t lb)
- {
-- return GC_debug_realloc(p, lb, RA "unknown", 0);
-+ return GC_debug_realloc(p, lb, RA NULL, 0);
- }