[NFCI] Change Android's NT_TYPE to NT_ANDROID_TYPE.
Normally, platform-specific note types in the toolchain are prefixed
with the platform name. Because we're exposing the NT_TYPE_MEMTAG and
synthesizing the note in the toolchain in an upcoming patch
(https://reviews.llvm.org/D118948), it's been requested that we change
the name to include the platform prefix.
While NT_TYPE_IDENT and NT_TYPE_KUSER aren't known about or synthesized
by the toolchain, update those references as well for consistency.
Bug: N/A
Test: Build Android
Change-Id: I7742e4917ae275d59d7984991664ea48028053a1
diff --git a/libc/arch-arm/bionic/kuser_helper_on.S b/libc/arch-arm/bionic/kuser_helper_on.S
index 2a1d86d..08291f7 100644
--- a/libc/arch-arm/bionic/kuser_helper_on.S
+++ b/libc/arch-arm/bionic/kuser_helper_on.S
@@ -32,10 +32,10 @@
.balign 4
.type kuser_helper_on, %object
kuser_helper_on:
- .long 2f-1f // int32_t namesz
- .long 3f-2f // int32_t descsz
- .long NT_TYPE_KUSER // int32_t type
-1:.ascii "Android\0" // char name[]
-2:.long 1 // int32_t on
+ .long 2f-1f // int32_t namesz
+ .long 3f-2f // int32_t descsz
+ .long NT_ANDROID_TYPE_KUSER // int32_t type
+1:.ascii "Android\0" // char name[]
+2:.long 1 // int32_t on
3:
.size kuser_helper_on, .-kuser_helper_on
diff --git a/libc/arch-arm64/bionic/note_memtag_heap_async.S b/libc/arch-arm64/bionic/note_memtag_heap_async.S
index 208115c..931f40b 100644
--- a/libc/arch-arm64/bionic/note_memtag_heap_async.S
+++ b/libc/arch-arm64/bionic/note_memtag_heap_async.S
@@ -33,11 +33,11 @@
.section ".note.android.memtag", "a", %note
.p2align 2
- .long 1f - 0f // int32_t namesz
- .long 3f - 2f // int32_t descsz
- .long NT_TYPE_MEMTAG // int32_t type
+ .long 1f - 0f // int32_t namesz
+ .long 3f - 2f // int32_t descsz
+ .long NT_ANDROID_TYPE_MEMTAG // int32_t type
0:
- .asciz "Android" // char name[]
+ .asciz "Android" // char name[]
1:
.p2align 2
2:
diff --git a/libc/arch-arm64/bionic/note_memtag_heap_sync.S b/libc/arch-arm64/bionic/note_memtag_heap_sync.S
index d71ad02..77ab03a 100644
--- a/libc/arch-arm64/bionic/note_memtag_heap_sync.S
+++ b/libc/arch-arm64/bionic/note_memtag_heap_sync.S
@@ -33,11 +33,11 @@
.section ".note.android.memtag", "a", %note
.p2align 2
- .long 1f - 0f // int32_t namesz
- .long 3f - 2f // int32_t descsz
- .long NT_TYPE_MEMTAG // int32_t type
+ .long 1f - 0f // int32_t namesz
+ .long 3f - 2f // int32_t descsz
+ .long NT_ANDROID_TYPE_MEMTAG // int32_t type
0:
- .asciz "Android" // char name[]
+ .asciz "Android" // char name[]
1:
.p2align 2
2:
diff --git a/libc/arch-common/bionic/crtbrand.S b/libc/arch-common/bionic/crtbrand.S
index 307ef2e..b7540e9 100644
--- a/libc/arch-common/bionic/crtbrand.S
+++ b/libc/arch-common/bionic/crtbrand.S
@@ -40,7 +40,7 @@
abitag:
.long 2f-1f // int32_t namesz
.long 3f-2f // int32_t descsz
- .long NT_TYPE_IDENT // int32_t type
+ .long NT_ANDROID_TYPE_IDENT // int32_t type
#ifdef __ANDROID__
1:.ascii "Android\0" // char name[]
2:.long PLATFORM_SDK_VERSION // int32_t android_api
diff --git a/libc/bionic/libc_init_static.cpp b/libc/bionic/libc_init_static.cpp
index 67e692c..ef2e56a 100644
--- a/libc/bionic/libc_init_static.cpp
+++ b/libc/bionic/libc_init_static.cpp
@@ -194,7 +194,7 @@
if (note->n_namesz != 8 || strncmp(name, "Android", 8) != 0) {
return false;
}
- if (note->n_type != NT_TYPE_MEMTAG) {
+ if (note->n_type != NT_ANDROID_TYPE_MEMTAG) {
return false;
}
if (note->n_descsz != 4) {
diff --git a/libc/private/bionic_asm_note.h b/libc/private/bionic_asm_note.h
index 80b8f01..d8559ff 100644
--- a/libc/private/bionic_asm_note.h
+++ b/libc/private/bionic_asm_note.h
@@ -28,6 +28,6 @@
#pragma once
-#define NT_TYPE_IDENT 1
-#define NT_TYPE_KUSER 3
-#define NT_TYPE_MEMTAG 4
+#define NT_ANDROID_TYPE_IDENT 1
+#define NT_ANDROID_TYPE_KUSER 3
+#define NT_ANDROID_TYPE_MEMTAG 4