diff options
| author | Rich Felker <dalias@aerifal.cx> | 2016-12-17 19:39:28 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-12-17 19:39:28 -0500 |
| commit | 9067a3006ea2f84395ab23a1dd30191387312e0c (patch) | |
| tree | 31c178c465dee5fefbf861753a2e56714ae12953 | |
| parent | fbbeda172d6f146067f9f57ab1498cf99c8d1007 (diff) | |
| download | musl-9067a3006ea2f84395ab23a1dd30191387312e0c.tar.gz musl-9067a3006ea2f84395ab23a1dd30191387312e0c.tar.bz2 musl-9067a3006ea2f84395ab23a1dd30191387312e0c.tar.xz musl-9067a3006ea2f84395ab23a1dd30191387312e0c.zip | |
disable use of arm memcpy asm if building as thumb code
the thumb incompatibilities in the asm are probably only minor and
should be fixable, but for now just use the C version.
| -rw-r--r-- | src/string/arm/memcpy.c | 2 | ||||
| -rw-r--r-- | src/string/arm/memcpy_le.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c index 041614f4..f703c9bd 100644 --- a/src/string/arm/memcpy.c +++ b/src/string/arm/memcpy.c @@ -1,3 +1,3 @@ -#if __ARMEB__ +#if __ARMEB__ || __thumb__ #include "../memcpy.c" #endif diff --git a/src/string/arm/memcpy_le.S b/src/string/arm/memcpy_le.S index 4db48445..9cfbcb2a 100644 --- a/src/string/arm/memcpy_le.S +++ b/src/string/arm/memcpy_le.S @@ -1,4 +1,4 @@ -#ifndef __ARMEB__ +#if !__ARMEB__ && !__thumb__ /* * Copyright (C) 2008 The Android Open Source Project |