tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "[NFCI] Change Android's NT_TYPE to NT_ANDROID_TYPE." am: 128475fd8c am: 606ea33a2a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1975227

Change-Id: I87f431125e31ef05f7b8410c9d5e0ee4dd8f1753
This commit is contained in:
Treehugger Robot 2022-02-08 00:45:00 +00:00 committed by Automerger Merge Worker
commit 0b2a7a44dd
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libc/arch-arm/bionic/kuser_helper_on.S
View file

@ -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

8
libc/arch-arm64/bionic/note_memtag_heap_async.S
View file

@ -33,11 +33,11 @@ __bionic_asm_custom_note_gnu_section()
.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:

8
libc/arch-arm64/bionic/note_memtag_heap_sync.S
View file

@ -33,11 +33,11 @@ __bionic_asm_custom_note_gnu_section()
.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:

2
libc/arch-common/bionic/crtbrand.S
View file

@ -40,7 +40,7 @@ __bionic_asm_custom_note_gnu_section()
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

2
libc/bionic/libc_init_static.cpp
View file

@ -194,7 +194,7 @@ static bool __read_memtag_note(const ElfW(Nhdr)* note, const char* name, const c
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) {

6
libc/private/bionic_asm_note.h
View file

@ -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