diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-19 16:53:20 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-20 13:51:26 -0800 |
| commit | 851e68a2402fa414544e66650e09dfdaac813e51 (patch) | |
| tree | baec353c8e9b6f24e885459b20a8748fc5c39468 /libc/arch-arm/krait/bionic/memset.S | |
| parent | 22c6b7ffd36fe8b34b677eea94d00aef2624e4e8 (diff) | |
| download | bionic-851e68a2402fa414544e66650e09dfdaac813e51.zip bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.gz bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.bz2 | |
Unify our assembler macros.
Our <machine/asm.h> files were modified from upstream, to the extent
that no architecture was actually using the upstream ENTRY or END macros,
assuming that architecture even had such a macro upstream. This patch moves
everyone to the same macros, with just a few tweaks remaining in the
<machine/asm.h> files, which no one should now use directly.
I've removed most of the unused cruft from the <machine/asm.h> files, though
there's still rather a lot in the mips/mips64 ones.
Bug: 12229603
Change-Id: I2fff287dc571ac1087abe9070362fb9420d85d6d
Diffstat (limited to 'libc/arch-arm/krait/bionic/memset.S')
| -rw-r--r-- | libc/arch-arm/krait/bionic/memset.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S index 1563327..5d1943b 100644 --- a/libc/arch-arm/krait/bionic/memset.S +++ b/libc/arch-arm/krait/bionic/memset.S @@ -27,8 +27,8 @@ */ #include <machine/cpu-features.h> -#include <machine/asm.h> -#include "private/libc_events.h" +#include <private/bionic_asm.h> +#include <private/libc_events.h> /* * This code assumes it is running on a processor that supports all arm v7 |