Skip to content

Commit 41c2116

Browse files
Andrew HsiehAndroid Git Automerger
Andrew Hsieh
authored and
Android Git Automerger
committed
am 30c2909: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '30c2909f512939f3cb51cc9682bca3235299e149': Refresh 64-bit headers/libs (WW29)
2 parents 8e1ad1c + 30c2909 commit 41c2116

File tree

232 files changed

+8232
-3564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+8232
-3564
lines changed

‎ndk/platforms/android-9/arch-x86/lib-bootstrap/lib64/crtbegin_dynamic.o‎

-40 Bytes
Binary file not shown.

‎ndk/platforms/android-9/arch-x86/lib-bootstrap/lib64/libc.so‎

-28.2 KB
Binary file not shown.

‎ndk/platforms/android-9/arch-x86/lib-bootstrap/lib64/libdl.so‎

24 Bytes
Binary file not shown.

‎ndk/platforms/android-L/arch-arm/include/asm/hwcap.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@
4444
#define HWCAP_IDIVT (1 << 18)
4545
#define HWCAP_VFPD32 (1 << 19)
4646
#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)
47-
#endif
47+
#define HWCAP_LPAE (1 << 20)
4848
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
49+
#define HWCAP_EVTSTRM (1 << 21)
50+
#endif

‎ndk/platforms/android-L/arch-arm/include/asm/kvm.h‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,74 +61,94 @@ struct kvm_regs {
6161
};
6262
#define KVM_ARM_TARGET_CORTEX_A15 0
6363
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
64-
#define KVM_ARM_NUM_TARGETS 1
64+
#define KVM_ARM_TARGET_CORTEX_A7 1
65+
#define KVM_ARM_NUM_TARGETS 2
6566
#define KVM_ARM_DEVICE_TYPE_SHIFT 0
6667
#define KVM_ARM_DEVICE_TYPE_MASK (0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)
67-
#define KVM_ARM_DEVICE_ID_SHIFT 16
6868
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
69+
#define KVM_ARM_DEVICE_ID_SHIFT 16
6970
#define KVM_ARM_DEVICE_ID_MASK (0xffff << KVM_ARM_DEVICE_ID_SHIFT)
7071
#define KVM_ARM_DEVICE_VGIC_V2 0
7172
#define KVM_VGIC_V2_ADDR_TYPE_DIST 0
72-
#define KVM_VGIC_V2_ADDR_TYPE_CPU 1
7373
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
74+
#define KVM_VGIC_V2_ADDR_TYPE_CPU 1
7475
#define KVM_VGIC_V2_DIST_SIZE 0x1000
7576
#define KVM_VGIC_V2_CPU_SIZE 0x2000
7677
#define KVM_ARM_VCPU_POWER_OFF 0
77-
struct kvm_vcpu_init {
7878
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
79+
struct kvm_vcpu_init {
7980
__u32 target;
8081
__u32 features[7];
8182
};
82-
struct kvm_sregs {
8383
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
84+
struct kvm_sregs {
8485
};
8586
struct kvm_fpu {
8687
};
87-
struct kvm_guest_debug_arch {
8888
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
89+
struct kvm_guest_debug_arch {
8990
};
9091
struct kvm_debug_exit_arch {
9192
};
92-
struct kvm_sync_regs {
9393
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
94+
struct kvm_sync_regs {
9495
};
9596
struct kvm_arch_memory_slot {
9697
};
97-
#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
9898
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
99+
#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
99100
#define KVM_REG_ARM_COPROC_SHIFT 16
100101
#define KVM_REG_ARM_32_OPC2_MASK 0x0000000000000007
101102
#define KVM_REG_ARM_32_OPC2_SHIFT 0
102-
#define KVM_REG_ARM_OPC1_MASK 0x0000000000000078
103103
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
104+
#define KVM_REG_ARM_OPC1_MASK 0x0000000000000078
104105
#define KVM_REG_ARM_OPC1_SHIFT 3
105106
#define KVM_REG_ARM_CRM_MASK 0x0000000000000780
106107
#define KVM_REG_ARM_CRM_SHIFT 7
107-
#define KVM_REG_ARM_32_CRN_MASK 0x0000000000007800
108108
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
109+
#define KVM_REG_ARM_32_CRN_MASK 0x0000000000007800
109110
#define KVM_REG_ARM_32_CRN_SHIFT 11
111+
#define ARM_CP15_REG_SHIFT_MASK(x,n) (((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK)
112+
#define __ARM_CP15_REG(op1,crn,crm,op2) (KVM_REG_ARM | (15 << KVM_REG_ARM_COPROC_SHIFT) | ARM_CP15_REG_SHIFT_MASK(op1, OPC1) | ARM_CP15_REG_SHIFT_MASK(crn, 32_CRN) | ARM_CP15_REG_SHIFT_MASK(crm, CRM) | ARM_CP15_REG_SHIFT_MASK(op2, 32_OPC2))
113+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
114+
#define ARM_CP15_REG32(...) (__ARM_CP15_REG(__VA_ARGS__) | KVM_REG_SIZE_U32)
115+
#define __ARM_CP15_REG64(op1,crm) (__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)
116+
#define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__)
117+
#define KVM_REG_ARM_TIMER_CTL ARM_CP15_REG32(0, 14, 3, 1)
118+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
119+
#define KVM_REG_ARM_TIMER_CNT ARM_CP15_REG64(1, 14)
120+
#define KVM_REG_ARM_TIMER_CVAL ARM_CP15_REG64(3, 14)
110121
#define KVM_REG_ARM_CORE (0x0010 << KVM_REG_ARM_COPROC_SHIFT)
111122
#define KVM_REG_ARM_CORE_REG(name) (offsetof(struct kvm_regs, name) / 4)
112-
#define KVM_REG_ARM_DEMUX (0x0011 << KVM_REG_ARM_COPROC_SHIFT)
113123
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
124+
#define KVM_REG_ARM_DEMUX (0x0011 << KVM_REG_ARM_COPROC_SHIFT)
114125
#define KVM_REG_ARM_DEMUX_ID_MASK 0x000000000000FF00
115126
#define KVM_REG_ARM_DEMUX_ID_SHIFT 8
116127
#define KVM_REG_ARM_DEMUX_ID_CCSIDR (0x00 << KVM_REG_ARM_DEMUX_ID_SHIFT)
117-
#define KVM_REG_ARM_DEMUX_VAL_MASK 0x00000000000000FF
118128
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
129+
#define KVM_REG_ARM_DEMUX_VAL_MASK 0x00000000000000FF
119130
#define KVM_REG_ARM_DEMUX_VAL_SHIFT 0
120131
#define KVM_REG_ARM_VFP (0x0012 << KVM_REG_ARM_COPROC_SHIFT)
121132
#define KVM_REG_ARM_VFP_MASK 0x000000000000FFFF
122-
#define KVM_REG_ARM_VFP_BASE_REG 0x0
123133
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
134+
#define KVM_REG_ARM_VFP_BASE_REG 0x0
124135
#define KVM_REG_ARM_VFP_FPSID 0x1000
125136
#define KVM_REG_ARM_VFP_FPSCR 0x1001
126137
#define KVM_REG_ARM_VFP_MVFR1 0x1006
127-
#define KVM_REG_ARM_VFP_MVFR0 0x1007
128138
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
139+
#define KVM_REG_ARM_VFP_MVFR0 0x1007
129140
#define KVM_REG_ARM_VFP_FPEXC 0x1008
130141
#define KVM_REG_ARM_VFP_FPINST 0x1009
131142
#define KVM_REG_ARM_VFP_FPINST2 0x100A
143+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
144+
#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
145+
#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
146+
#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2
147+
#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32
148+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
149+
#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
150+
#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0
151+
#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
132152
#define KVM_ARM_IRQ_TYPE_SHIFT 24
133153
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
134154
#define KVM_ARM_IRQ_TYPE_MASK 0xff

‎ndk/platforms/android-L/arch-arm/include/asm/perf_regs.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/****************************************************************************
2+
****************************************************************************
3+
***
4+
*** This header was automatically generated from a Linux kernel header
5+
*** of the same name, to make information necessary for userspace to
6+
*** call into the kernel available to libc. It contains only constants,
7+
*** structures, and macros generated from the original header, and thus,
8+
*** contains no copyrightable information.
9+
***
10+
*** To edit the content of this header, modify the corresponding
11+
*** source file (e.g. under external/kernel-headers/original/) then
12+
*** run bionic/libc/kernel/tools/update_all.py
13+
***
14+
*** Any manual change here will be lost the next time this script will
15+
*** be run. You've been warned!
16+
***
17+
****************************************************************************
18+
****************************************************************************/
19+
#ifndef _ASM_ARM_PERF_REGS_H
20+
#define _ASM_ARM_PERF_REGS_H
21+
enum perf_event_arm_regs {
22+
PERF_REG_ARM_R0,
23+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
24+
PERF_REG_ARM_R1,
25+
PERF_REG_ARM_R2,
26+
PERF_REG_ARM_R3,
27+
PERF_REG_ARM_R4,
28+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
29+
PERF_REG_ARM_R5,
30+
PERF_REG_ARM_R6,
31+
PERF_REG_ARM_R7,
32+
PERF_REG_ARM_R8,
33+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
34+
PERF_REG_ARM_R9,
35+
PERF_REG_ARM_R10,
36+
PERF_REG_ARM_FP,
37+
PERF_REG_ARM_IP,
38+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
39+
PERF_REG_ARM_SP,
40+
PERF_REG_ARM_LR,
41+
PERF_REG_ARM_PC,
42+
PERF_REG_ARM_MAX,
43+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
44+
};
45+
#endif

‎ndk/platforms/android-L/arch-arm/include/asm/ptrace.h‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
#define IRQ26_MODE 0x00000002
4545
#define SVC26_MODE 0x00000003
4646
#define USR_MODE 0x00000010
47-
#define FIQ_MODE 0x00000011
47+
#define SVC_MODE 0x00000013
4848
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
49+
#define FIQ_MODE 0x00000011
4950
#define IRQ_MODE 0x00000012
50-
#define SVC_MODE 0x00000013
5151
#define ABT_MODE 0x00000017
5252
#define HYP_MODE 0x0000001a
5353
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
@@ -56,63 +56,65 @@
5656
#define MODE32_BIT 0x00000010
5757
#define MODE_MASK 0x0000001f
5858
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
59-
#define PSR_T_BIT 0x00000020
59+
#define V4_PSR_T_BIT 0x00000020
60+
#define V7M_PSR_T_BIT 0x01000000
61+
#define PSR_T_BIT V4_PSR_T_BIT
6062
#define PSR_F_BIT 0x00000040
63+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
6164
#define PSR_I_BIT 0x00000080
6265
#define PSR_A_BIT 0x00000100
63-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
6466
#define PSR_E_BIT 0x00000200
6567
#define PSR_J_BIT 0x01000000
68+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
6669
#define PSR_Q_BIT 0x08000000
6770
#define PSR_V_BIT 0x10000000
68-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
6971
#define PSR_C_BIT 0x20000000
7072
#define PSR_Z_BIT 0x40000000
73+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
7174
#define PSR_N_BIT 0x80000000
7275
#define PSR_f 0xff000000
73-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
7476
#define PSR_s 0x00ff0000
7577
#define PSR_x 0x0000ff00
78+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
7679
#define PSR_c 0x000000ff
7780
#define APSR_MASK 0xf80f0000
78-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
7981
#define PSR_ISET_MASK 0x01000010
8082
#define PSR_IT_MASK 0x0600fc00
83+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
8184
#define PSR_ENDIAN_MASK 0x00000200
8285
#define PSR_ENDSTATE 0
83-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
8486
#define PT_TEXT_ADDR 0x10000
8587
#define PT_DATA_ADDR 0x10004
88+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
8689
#define PT_TEXT_END_ADDR 0x10008
8790
#ifndef __ASSEMBLY__
88-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
8991
struct pt_regs {
9092
long uregs[18];
93+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
9194
};
9295
#define ARM_cpsr uregs[16]
93-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
9496
#define ARM_pc uregs[15]
9597
#define ARM_lr uregs[14]
98+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
9699
#define ARM_sp uregs[13]
97100
#define ARM_ip uregs[12]
98-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
99101
#define ARM_fp uregs[11]
100102
#define ARM_r10 uregs[10]
103+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
101104
#define ARM_r9 uregs[9]
102105
#define ARM_r8 uregs[8]
103-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
104106
#define ARM_r7 uregs[7]
105107
#define ARM_r6 uregs[6]
108+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
106109
#define ARM_r5 uregs[5]
107110
#define ARM_r4 uregs[4]
108-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
109111
#define ARM_r3 uregs[3]
110112
#define ARM_r2 uregs[2]
113+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
111114
#define ARM_r1 uregs[1]
112115
#define ARM_r0 uregs[0]
113-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
114116
#define ARM_ORIG_r0 uregs[17]
115117
#define ARM_VFPREGS_SIZE ( 32 * 8 + 4 )
118+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
116119
#endif
117120
#endif
118-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

‎ndk/platforms/android-L/arch-arm/include/asm/unistd.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,26 +456,29 @@
456456
#define __NR_kcmp (__NR_SYSCALL_BASE+378)
457457
#define __NR_finit_module (__NR_SYSCALL_BASE+379)
458458
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
459+
#define __NR_sched_setattr (__NR_SYSCALL_BASE+380)
460+
#define __NR_sched_getattr (__NR_SYSCALL_BASE+381)
459461
#define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000)
460462
#define __ARM_NR_breakpoint (__ARM_NR_BASE+1)
463+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
461464
#define __ARM_NR_cacheflush (__ARM_NR_BASE+2)
462465
#define __ARM_NR_usr26 (__ARM_NR_BASE+3)
463-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
464466
#define __ARM_NR_usr32 (__ARM_NR_BASE+4)
465467
#define __ARM_NR_set_tls (__ARM_NR_BASE+5)
468+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
466469
#undef __NR_time
467470
#undef __NR_umount
468-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
469471
#undef __NR_stime
470472
#undef __NR_alarm
473+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
471474
#undef __NR_utime
472475
#undef __NR_getrlimit
473-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
474476
#undef __NR_select
475477
#undef __NR_readdir
478+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
476479
#undef __NR_mmap
477480
#undef __NR_socketcall
478-
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
479481
#undef __NR_syscall
480482
#undef __NR_ipc
483+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
481484
#endif

‎ndk/platforms/android-L/arch-arm/lib/libc.a‎

1.61 MB
Binary file not shown.

‎ndk/platforms/android-L/arch-arm/lib/libm.a‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)