diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S b/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S index a1e6c8b2bde..f6c07b51462 100644 --- a/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S +++ b/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S @@ -67,6 +67,7 @@ .type \f, %function \f: .endm + #ifdef __ARMEB__ #define S2LO lsl #define S2HI lsr diff --git a/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h b/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h index beb6df9dd3d..888ae2ea8af 100644 --- a/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h +++ b/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h @@ -178,4 +178,5 @@ # error Unable to determine architecture version. # endif -#endif /* __ARM_ARCH */ \ No newline at end of file +#endif /* __ARM_ARCH */ + diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S b/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S index 9612297b73d..2be0abffde4 100644 --- a/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S +++ b/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S @@ -26,36 +26,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __ARM_BIG_ENDIAN -#define S2LO lsl -#define S2LOEQ lsleq -#define S2HI lsr -#define MSB 0x000000ff -#define LSB 0xff000000 -#define BYTE0_OFFSET 24 -#define BYTE1_OFFSET 16 -#define BYTE2_OFFSET 8 -#define BYTE3_OFFSET 0 -#else /* not __ARM_BIG_ENDIAN */ -#define S2LO lsr -#define S2LOEQ lsreq -#define S2HI lsl -#define BYTE0_OFFSET 0 -#define BYTE1_OFFSET 8 -#define BYTE2_OFFSET 16 -#define BYTE3_OFFSET 24 -#define MSB 0xff000000 -#define LSB 0x000000ff -#endif /* not __ARM_BIG_ENDIAN */ - - .macro def_fn f p2align=0 - .text - .p2align \p2align - .global \f - .type \f, %function -\f: - .endm - /* Very similar to the generic code, but uses Thumb2 as implemented in ARMv7-M. */ diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S b/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S index a1e6c8b2bde..f6c07b51462 100644 --- a/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S +++ b/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S @@ -67,6 +67,7 @@ .type \f, %function \f: .endm + #ifdef __ARMEB__ #define S2LO lsl #define S2HI lsr diff --git a/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h b/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h index beb6df9dd3d..888ae2ea8af 100644 --- a/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h +++ b/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h @@ -178,4 +178,5 @@ # error Unable to determine architecture version. # endif -#endif /* __ARM_ARCH */ \ No newline at end of file +#endif /* __ARM_ARCH */ + diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S b/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S index 9612297b73d..2be0abffde4 100644 --- a/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S +++ b/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S @@ -26,36 +26,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __ARM_BIG_ENDIAN -#define S2LO lsl -#define S2LOEQ lsleq -#define S2HI lsr -#define MSB 0x000000ff -#define LSB 0xff000000 -#define BYTE0_OFFSET 24 -#define BYTE1_OFFSET 16 -#define BYTE2_OFFSET 8 -#define BYTE3_OFFSET 0 -#else /* not __ARM_BIG_ENDIAN */ -#define S2LO lsr -#define S2LOEQ lsreq -#define S2HI lsl -#define BYTE0_OFFSET 0 -#define BYTE1_OFFSET 8 -#define BYTE2_OFFSET 16 -#define BYTE3_OFFSET 24 -#define MSB 0xff000000 -#define LSB 0x000000ff -#endif /* not __ARM_BIG_ENDIAN */ - - .macro def_fn f p2align=0 - .text - .p2align \p2align - .global \f - .type \f, %function -\f: - .endm - /* Very similar to the generic code, but uses Thumb2 as implemented in ARMv7-M. */ diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S b/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S index a1e6c8b2bde..f6c07b51462 100644 --- a/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S +++ b/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S @@ -67,6 +67,7 @@ .type \f, %function \f: .endm + #ifdef __ARMEB__ #define S2LO lsl #define S2HI lsr