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 /linker | |
| 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 'linker')
| -rw-r--r-- | linker/arch/arm64/begin.S | 2 | ||||
| -rw-r--r-- | linker/arch/mips64/begin.S | 2 | ||||
| -rw-r--r-- | linker/arch/x86_64/begin.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linker/arch/arm64/begin.S b/linker/arch/arm64/begin.S index 55618b7..c96ede7 100644 --- a/linker/arch/arm64/begin.S +++ b/linker/arch/arm64/begin.S @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#include <machine/asm.h> +#include <private/bionic_asm.h> ENTRY(_start) mov x0, sp diff --git a/linker/arch/mips64/begin.S b/linker/arch/mips64/begin.S index 9a85925..9e741c0 100644 --- a/linker/arch/mips64/begin.S +++ b/linker/arch/mips64/begin.S @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#include <machine/asm.h> +#include <private/bionic_asm.h> #if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) #define ELF_DYNSZ 8 diff --git a/linker/arch/x86_64/begin.S b/linker/arch/x86_64/begin.S index 9ecad1a..aff4660 100644 --- a/linker/arch/x86_64/begin.S +++ b/linker/arch/x86_64/begin.S @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#include <machine/asm.h> +#include <private/bionic_asm.h> ENTRY(_start) /* Pass elfdata to __linker_init. */ |