Skip to content

Commit b18c32c

Browse files
committed
Use weak linkage for aeabi memory functions
1 parent 3a769f6 commit b18c32c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/arm.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,14 @@ pub unsafe fn __aeabi_ldivmod() {
142142

143143
#[cfg(not(target_os = "ios"))]
144144
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
145-
#[cfg_attr(thumb, linkage = "weak")]
145+
#[linkage = "weak"]
146146
pub unsafe extern "aapcs" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, n: usize) {
147147
::mem::memcpy(dest, src, n);
148148
}
149149

150150
#[cfg(not(target_os = "ios"))]
151151
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
152-
#[cfg_attr(thumb, linkage = "weak")]
152+
#[linkage = "weak"]
153153
pub unsafe extern "aapcs" fn __aeabi_memcpy4(dest: *mut u8, src: *const u8, mut n: usize) {
154154
// We are guaranteed 4-alignment, so accessing at u32 is okay.
155155
let mut dest = dest as *mut u32;
@@ -167,43 +167,43 @@ pub unsafe extern "aapcs" fn __aeabi_memcpy4(dest: *mut u8, src: *const u8, mut
167167

168168
#[cfg(not(target_os = "ios"))]
169169
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
170-
#[cfg_attr(thumb, linkage = "weak")]
170+
#[linkage = "weak"]
171171
pub unsafe extern "aapcs" fn __aeabi_memcpy8(dest: *mut u8, src: *const u8, n: usize) {
172172
__aeabi_memcpy4(dest, src, n);
173173
}
174174

175175
#[cfg(not(target_os = "ios"))]
176176
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
177-
#[cfg_attr(thumb, linkage = "weak")]
177+
#[linkage = "weak"]
178178
pub unsafe extern "aapcs" fn __aeabi_memmove(dest: *mut u8, src: *const u8, n: usize) {
179179
::mem::memmove(dest, src, n);
180180
}
181181

182182
#[cfg(not(any(target_os = "ios", target_env = "msvc")))]
183183
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
184-
#[cfg_attr(thumb, linkage = "weak")]
184+
#[linkage = "weak"]
185185
pub unsafe extern "aapcs" fn __aeabi_memmove4(dest: *mut u8, src: *const u8, n: usize) {
186186
__aeabi_memmove(dest, src, n);
187187
}
188188

189189
#[cfg(not(any(target_os = "ios", target_env = "msvc")))]
190190
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
191-
#[cfg_attr(thumb, linkage = "weak")]
191+
#[linkage = "weak"]
192192
pub unsafe extern "aapcs" fn __aeabi_memmove8(dest: *mut u8, src: *const u8, n: usize) {
193193
__aeabi_memmove(dest, src, n);
194194
}
195195

196196
#[cfg(not(target_os = "ios"))]
197197
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
198-
#[cfg_attr(thumb, linkage = "weak")]
198+
#[linkage = "weak"]
199199
pub unsafe extern "aapcs" fn __aeabi_memset(dest: *mut u8, n: usize, c: i32) {
200200
// Note the different argument order
201201
::mem::memset(dest, c, n);
202202
}
203203

204204
#[cfg(not(target_os = "ios"))]
205205
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
206-
#[cfg_attr(thumb, linkage = "weak")]
206+
#[linkage = "weak"]
207207
pub unsafe extern "aapcs" fn __aeabi_memset4(dest: *mut u8, mut n: usize, c: i32) {
208208
let mut dest = dest as *mut u32;
209209

@@ -221,28 +221,28 @@ pub unsafe extern "aapcs" fn __aeabi_memset4(dest: *mut u8, mut n: usize, c: i32
221221

222222
#[cfg(not(target_os = "ios"))]
223223
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
224-
#[cfg_attr(thumb, linkage = "weak")]
224+
#[linkage = "weak"]
225225
pub unsafe extern "aapcs" fn __aeabi_memset8(dest: *mut u8, n: usize, c: i32) {
226226
__aeabi_memset4(dest, n, c);
227227
}
228228

229229
#[cfg(not(target_os = "ios"))]
230230
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
231-
#[cfg_attr(thumb, linkage = "weak")]
231+
#[linkage = "weak"]
232232
pub unsafe extern "aapcs" fn __aeabi_memclr(dest: *mut u8, n: usize) {
233233
__aeabi_memset(dest, n, 0);
234234
}
235235

236236
#[cfg(not(any(target_os = "ios", target_env = "msvc")))]
237237
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
238-
#[cfg_attr(thumb, linkage = "weak")]
238+
#[linkage = "weak"]
239239
pub unsafe extern "aapcs" fn __aeabi_memclr4(dest: *mut u8, n: usize) {
240240
__aeabi_memset4(dest, n, 0);
241241
}
242242

243243
#[cfg(not(any(target_os = "ios", target_env = "msvc")))]
244244
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
245-
#[cfg_attr(thumb, linkage = "weak")]
245+
#[linkage = "weak"]
246246
pub unsafe extern "aapcs" fn __aeabi_memclr8(dest: *mut u8, n: usize) {
247247
__aeabi_memset4(dest, n, 0);
248248
}

0 commit comments

Comments
 (0)