commit d4ca231ae2891e5c9eccb6e9a2e6af7fabcfc2a5
author Elliott Hughes <enh@google.com> Wed Oct 11 22:27:45 2017 -0700
committer Elliott Hughes <enh@google.com> Thu Oct 12 13:19:51 2017 -0700
tree 4ffbf1b6c0d0acb3df88b1ce02d574eeaead3f0a
parent 36f7b8b7891f0af56eb61e7d32cc8cedb5ded8de

Unified sysroot: kill arch-specific include dirs.

<machine/asm.h> was internal use only.

<machine/fenv.h> is quite large, but can live in <bits/...>.

<machine/regdef.h> is trivially replaced by saying $x instead of x in
our assembler.

<machine/setjmp.h> is trivially inlined into <setjmp.h>.

<sgidefs.h> is unused.

Bug: N/A
Test: builds
Change-Id: Id05dbab43a2f9537486efb8f27a5ef167b055815

libc/private/bionic_asm.h

diff --git a/libc/private/bionic_asm.h b/libc/private/bionic_asm.h
index c1fab1f..92f38aa 100644
--- a/libc/private/bionic_asm.h
+++ b/libc/private/bionic_asm.h
@@ -36,7 +36,17 @@
 #define __bionic_asm_custom_end(f)
 #define __bionic_asm_function_type @function
 
-#include <machine/asm.h>
+#if defined(__aarch64__)
+#include <private/bionic_asm_arm64.h>
+#elif defined(__arm__)
+#include <private/bionic_asm_arm.h>
+#elif defined(__i386__)
+#include <private/bionic_asm_x86.h>
+#elif defined(__mips__)
+#include <private/bionic_asm_mips.h>
+#elif defined(__x86_64__)
+#include <private/bionic_asm_x86_64.h>
+#endif
 
 #define ENTRY_NO_DWARF(f) \
     .text; \
@@ -72,4 +82,4 @@
     .globl alias; \
     .equ alias, original
 
-#endif /* _PRIVATE_BIONIC_ASM_H_ */
+#endif