1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
--- src/lib/libast/vmalloc/malloc.c.orig 2012-06-28 06:52:46.000000000 +0000
+++ src/lib/libast/vmalloc/malloc.c
@@ -61,6 +61,10 @@ extern char* getenv(const char*);
#undef mallinfo
typedef struct ______mallinfo Mallinfo_t;
#undef mallopt
+#undef memalign
+#define memalign _ast_memalign
+#undef posix_memalign
+#define posix_memalign _ast_posix_memalign
#undef mstats
typedef struct ______mstats Mstats_t;
#undef realloc
@@ -153,6 +157,7 @@ static int _Vmpffd = -1;
#undef malloc
#undef mallopt
#undef memalign
+#undef posix_memalign
#undef mstats
#undef realloc
#undef valloc
@@ -166,6 +171,7 @@ static int _Vmpffd = -1;
#undef free
#undef malloc
#undef memalign
+#undef posix_memalign
#undef realloc
#define calloc _ast_calloc
@@ -173,6 +179,7 @@ static int _Vmpffd = -1;
#define free _ast_free
#define malloc _ast_malloc
#define memalign _ast_memalign
+#define posix_memalign _ast_posix_memalign
#define realloc _ast_realloc
#endif
@@ -847,6 +854,9 @@ extern Void_t* F1(_malloc, size_t,n) { r
#if _lib_memalign
extern Void_t* F2(_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -864,6 +874,9 @@ extern Void_t* F1(__malloc, size_t,n) {
#if _lib_memalign
extern Void_t* F2(__memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -881,6 +894,9 @@ extern Void_t* F1(__libc_malloc, size_t,
#if _lib_memalign
extern Void_t* F2(__libc_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__libc_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__libc_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -1015,6 +1031,11 @@ extern Void_t* malloc _ARG_((size_t));
extern Void_t* memalign _ARG_((size_t, size_t));
#endif
+#if _lib_posix_memalign
+#undef posix_memalign
+extern Void_t* posix_memalign _ARG_((size_t, size_t));
+#endif
+
#if _lib_pvalloc
#undef pvalloc
extern Void_t* pvalloc _ARG_((size_t));
@@ -1039,6 +1060,9 @@ extern Void_t* F1(_ast_malloc, size_t,n)
#if _lib_memalign
extern Void_t* F2(_ast_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_ast_posix_memalign, size_t,a, size_t,n) { return memalign(a, n); }
+#endif
extern Void_t* F2(_ast_realloc, Void_t*,p, size_t,n) { return realloc(p, n); }
#endif
$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
--- src/lib/libast/vmalloc/malloc.c.orig 2012-06-28 06:52:46.000000000 +0000
+++ src/lib/libast/vmalloc/malloc.c
@@ -61,6 +61,10 @@ extern char* getenv(const char*);
#undef mallinfo
typedef struct ______mallinfo Mallinfo_t;
#undef mallopt
+#undef memalign
+#define memalign _ast_memalign
+#undef posix_memalign
+#define posix_memalign _ast_posix_memalign
#undef mstats
typedef struct ______mstats Mstats_t;
#undef realloc
@@ -153,6 +157,7 @@ static int _Vmpffd = -1;
#undef malloc
#undef mallopt
#undef memalign
+#undef posix_memalign
#undef mstats
#undef realloc
#undef valloc
@@ -166,6 +171,7 @@ static int _Vmpffd = -1;
#undef free
#undef malloc
#undef memalign
+#undef posix_memalign
#undef realloc
#define calloc _ast_calloc
@@ -173,6 +179,7 @@ static int _Vmpffd = -1;
#define free _ast_free
#define malloc _ast_malloc
#define memalign _ast_memalign
+#define posix_memalign _ast_posix_memalign
#define realloc _ast_realloc
#endif
@@ -847,6 +854,9 @@ extern Void_t* F1(_malloc, size_t,n) { r
#if _lib_memalign
extern Void_t* F2(_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -864,6 +874,9 @@ extern Void_t* F1(__malloc, size_t,n) {
#if _lib_memalign
extern Void_t* F2(__memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -881,6 +894,9 @@ extern Void_t* F1(__libc_malloc, size_t,
#if _lib_memalign
extern Void_t* F2(__libc_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(__libc_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
+#endif
#if _lib_pvalloc
extern Void_t* F1(__libc_pvalloc, size_t,n) { return pvalloc(n); }
#endif
@@ -1015,6 +1031,11 @@ extern Void_t* malloc _ARG_((size_t));
extern Void_t* memalign _ARG_((size_t, size_t));
#endif
+#if _lib_posix_memalign
+#undef posix_memalign
+extern Void_t* posix_memalign _ARG_((size_t, size_t));
+#endif
+
#if _lib_pvalloc
#undef pvalloc
extern Void_t* pvalloc _ARG_((size_t));
@@ -1039,6 +1060,9 @@ extern Void_t* F1(_ast_malloc, size_t,n)
#if _lib_memalign
extern Void_t* F2(_ast_memalign, size_t,a, size_t,n) { return memalign(a, n); }
#endif
+#if _lib_posix_memalign
+extern Void_t* F2(_ast_posix_memalign, size_t,a, size_t,n) { return memalign(a, n); }
+#endif
extern Void_t* F2(_ast_realloc, Void_t*,p, size_t,n) { return realloc(p, n); }
#endif
|
