Commit graph

41381 commits

Author SHA1 Message Date
Treehugger Robot
8e631624e9 Merge "NFC: remove unnecessary branching" into main 2024-02-01 19:51:56 +00:00
Florian Mayer
d541611c77 NFC: remove unnecessary branching
Change-Id: Iac82f1fdc30261be262810de0d86369f0071044f
2024-01-31 23:09:39 +00:00
Automerger Merge Worker
5965d63c95 Merge "Merge "Merge "sys_statvfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: 7123abff51" into android14-tests-dev am: 39c7a2a511" into main 2024-01-31 19:55:46 +00:00
Automerger Merge Worker
9405602385 Merge "Merge "sys_statvfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: 7123abff51" into android14-tests-dev am: 39c7a2a511
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2928751

Change-Id: Id33e6f6ce90a74d756853f81bd0553ca91e56c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 19:55:43 +00:00
Automerger Merge Worker
39c7a2a511 Merge "Merge "sys_statvfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: 7123abff51" into android14-tests-dev 2024-01-31 19:15:47 +00:00
Treehugger Robot
adba83240b Merge "sys_statvfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: 7123abff51
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2928751

Change-Id: I38541b1db092dd37044970a52494dafc5ed6ed26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 19:15:43 +00:00
Treehugger Robot
7123abff51 Merge "sys_statvfs_test: fix expectation for Linux 6.7." into android13-tests-dev 2024-01-31 18:42:56 +00:00
Automerger Merge Worker
296a197ce1 Merge "Merge "Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: fb7d4c4761" into android14-tests-dev am: 014dc3bc7b" into main 2024-01-31 16:46:42 +00:00
Automerger Merge Worker
4e9a1d06d4 Merge "Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: fb7d4c4761" into android14-tests-dev am: 014dc3bc7b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2929452

Change-Id: Ie44f35dc57e483bcde018ac9d9a86abd858d716a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 16:46:39 +00:00
Automerger Merge Worker
014dc3bc7b Merge "Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: fb7d4c4761" into android14-tests-dev 2024-01-31 16:02:58 +00:00
Elliott Hughes
d06a358244 Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: fb7d4c4761
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2929452

Change-Id: Ib4321aba8f1be78db8a79e7f858c7813d71ed11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 16:02:50 +00:00
Elliott Hughes
fb7d4c4761 Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev 2024-01-31 15:23:28 +00:00
Treehugger Robot
4da631c06c Merge "bionic: runtime-module-sdk: Add crt_pad_segment dependency" into main 2024-01-30 21:19:34 +00:00
Kalesh Singh
d13ca8d06a bionic: runtime-module-sdk: Add crt_pad_segment dependency
Bug: 316403210
Test: m runtime-module-sdk
Test: unzip -l out/soong/mainline-sdks/runtime-module-sdk-current.zip
      | grep crt_pad_segment.o
Change-Id: Ibc6941722b25b1979c7e2c9309271248f59c8970
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-01-30 07:29:49 -08:00
Elliott Hughes
234dc36ac6 sys_statvfs_test: fix expectation for Linux 6.7.
I'd assumed that it was _deliberate_ that filesystems like procfs
reported 0 here, but apparently not. Good news: this makes for a more
worthwhile test than we had previously (at least when run on a 6.7+
kernel).

Bug: http://b/321880382 (for sys_vfs_test)
Bug: http://b/319590754 (for sys_statvfs_test)
Test: treehugger
Change-Id: I0a63faa8ca359592a29d7bca1a40ecd94fd50044
(cherry picked from commit 7506c37386)
2024-01-26 23:45:11 +00:00
Elliott Hughes
28c0d8b42c Merge "libc/Android.bp: remove libc_pthread and libc_nopthread." into main 2024-01-26 23:24:46 +00:00
Elliott Hughes
b094892bed libc/Android.bp: remove libc_pthread and libc_nopthread.
The motivation for these is long gone, and now they only serve to
distract/duplicate.

Test: treehugger
Change-Id: I28f4ea6dd02fb564a15ab23b9f70d447ddf0c090
2024-01-26 00:28:12 +00:00
Elliott Hughes
b02dbce7d8 Merge "Start removing unnecessary libc/Android.bp complexity." into main 2024-01-26 00:25:42 +00:00
Elliott Hughes
3a4a0c73bb Merge "Clarify which architectures do/don't need sa_restorer." into main 2024-01-25 23:46:52 +00:00
Elliott Hughes
3e7e2251fa sys_vfs_test: fix expectation for Linux 6.7.
I'd assumed that it was _deliberate_ that filesystems like procfs
reported 0 here, but apparently not. Good news: this makes for a more
worthwhile test than we had previously (at least when run on a 6.7+
kernel).

(This is the sys_vfs_test equivalent of the earlier change made to
sys_statvfs_test.)

Bug: http://b/321880382 (for sys_vfs_test)
Bug: http://b/319590754 (for sys_statvfs_test)
Test: treehugger
Change-Id: I3c6f784d1e348bf1be3a102d1dd6336c33d0b2db
(cherry picked from commit 1b48afbc66)
2024-01-25 22:53:16 +00:00
Elliott Hughes
284596e19e Merge "sys_vfs_test: fix expectation for Linux 6.7." into main 2024-01-25 22:53:04 +00:00
Elliott Hughes
99cc916f7a Start removing unnecessary libc/Android.bp complexity.
Things have gotten way out of hand in here...

Test: treehugger
Change-Id: I0dc6f9369828578409d422f76cb48a4553472d3e
2024-01-25 22:45:24 +00:00
Elliott Hughes
1b48afbc66 sys_vfs_test: fix expectation for Linux 6.7.
I'd assumed that it was _deliberate_ that filesystems like procfs
reported 0 here, but apparently not. Good news: this makes for a more
worthwhile test than we had previously (at least when run on a 6.7+
kernel).

(This is the sys_vfs_test equivalent of the earlier change made to
sys_statvfs_test.)

Bug: http://b/321880382 (for sys_vfs_test)
Bug: http://b/319590754 (for sys_statvfs_test)
Test: treehugger
Change-Id: I3c6f784d1e348bf1be3a102d1dd6336c33d0b2db
2024-01-25 10:12:37 -08:00
Elliott Hughes
20a3661d6c Clarify which architectures do/don't need sa_restorer.
In particular: 32-bit x86 doesn't need sa_restorer either.

I still don't fully understand why arm32 and x86-64 do, so I've left the
comments in those .S files alone. I haven't (knowingly) tested
compiler-rt since we switched from libgcc (which is what the comments
refer to), but I have tested libunwindstack since we switched from
libunwind, and that does fail existing bionic tests for unwinds through
signal frames --- I just don't know why, or whether there's a better fix.

Anyway, local testing suggests that the 32-bit x86 code is vestigial, so
let's get rid of it.

Test: treehugger
Change-Id: I3e2616f736d27a8463814356e5adb52fd76a90cc
2024-01-24 14:25:00 -08:00
Elliott Hughes
5c73b4f984 Merge "Fix assembler warnings." into main 2024-01-24 15:59:47 +00:00
Elliott Hughes
d7831208b2 Fix assembler warnings.
clang complains if you define a symbol and _then_ make it weak, rather
than the other way round:

  /tmp/setjmp-c3c977.s:90:1: warning: sigsetjmp changed binding to STB_WEAK
  .weak sigsetjmp;
  ^

Test: treehugger
Change-Id: Iee6b0ea456bb2e92aea810ce45f171caabaa89d2
2024-01-23 22:06:19 +00:00
Treehugger Robot
e8cfc14651 Merge "Disable stack protector test with stack MTE" into main 2024-01-23 09:22:16 +00:00
Elliott Hughes
7606110490 Merge "Silence the linker_relocation benchmark weak symbol warnings." into main 2024-01-22 21:32:04 +00:00
Mitch Phillips
7ce3ec389b Disable stack protector test with stack MTE
Obviously stack MTE conflates with the stack protector test. It doesn't
conflate with heap MTE (which we're expecting to push more broadly as
part of the -eng build), and so we want to keep this test working under
heap-mte scenarios as well.

Hence, the check-if-stack-variable-is-tagged test, and only under that
case, we skip.

Test: atest bionic-unit-tests on a fullmte device (with stack MTE turned
back on and the new compiler).
Bug: 320448268

Change-Id: I2ecee8a7c46416883235bf5c4ee2de9408047829
2024-01-22 12:40:34 +01:00
Elliott Hughes
4c41cab3f3 Silence the linker_relocation benchmark weak symbol warnings.
Test: treehugger
Change-Id: I617e82540ba5f22e237bde344d2b568a369692cd
2024-01-20 00:30:51 +00:00
Treehugger Robot
6467c97105 Merge "bpfmt all the .bp files to silence ayeaye." into main 2024-01-19 22:08:02 +00:00
Elliott Hughes
1eacc0edc0 bpfmt all the .bp files to silence ayeaye.
Test: treehugger
Change-Id: I5b7add6f013dcd2d4eee4851b7a2a22310c6d533
2024-01-19 19:05:36 +00:00
Elliott Hughes
569b45dce5 Merge "Remove ODR violation with arm64 memrchr." into main 2024-01-19 19:03:08 +00:00
Christopher Ferris
599887ae3e Merge "Update to v6.7 kernel headers." into main 2024-01-19 00:47:41 +00:00
Elliott Hughes
1ab5d279a1 Remove ODR violation with arm64 memrchr.
I haven't seen this cause a problem in practice --- I noticed this while
looking at something else entirely.

Test: llvm-objdump
Change-Id: I56e38165f45554ede538a50439f8e8ffe72871c8
2024-01-19 00:08:23 +00:00
Christopher Ferris
0f79521706 Update to v6.7 kernel headers.
Kernel headers coming from:

Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-6.7

NOTE: The file bionic/libc/kernel/uapi/linux/usb/f_accessory.h was
deleted in the 6.7 kernel along with the functionality. However,
there is no current replacement. For now keep the file here, but at
some point when the new implementation is ready, this file will need to
be moved to the places that still need to be backwards compatible.

Test: Builds and bionic unit tests pass on raven.
Test: Able to log in to an Android GO 32 bit device.
Change-Id: Ibf5684ed140616c02bb9464bbd6422a9281a29cf
2024-01-18 12:45:00 -08:00
Treehugger Robot
6a25dff8a3 Merge "Update libc/NOTICE." into main 2024-01-18 01:43:34 +00:00
Elliott Hughes
78afa49091 Update libc/NOTICE.
Test: tools/update_notice.sh
Change-Id: I4068999ee3269f0db0a52eb2c65db8587f2f0911
2024-01-17 17:02:30 -08:00
Treehugger Robot
e8a2051ce0 Merge "Disable -Wignored-pragmas only for arm32" into main 2024-01-16 20:37:54 +00:00
Pirama Arumuga Nainar
6896552367 Disable -Wignored-pragmas only for arm32
Bug: http://b/178516148

Recent clang versions support `#pragma STDC FENV_ACCESS ON` for aarch64 and riscv64.

Change-Id: I8117130c4d7d64221699ca7a27b93a3a86f64d00
Test: presubmit
2024-01-16 19:52:02 +00:00
Treehugger Robot
362385c522 Merge "Revert "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior."" into main 2024-01-13 00:32:44 +00:00
Elliott Hughes
7c9c122c4c Revert "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior."
This reverts commit 4c5eeb8346 in main,
where we have the newer tzcode and so can pass the stricter test.

Bug: http://b/307680874
Test: treehugger
Change-Id: I28a6f423815655a59fb503230e50a7b618b0349a
2024-01-12 23:49:44 +00:00
Automerger Merge Worker
345aa1e903 Merge changes from topic "am-1324cc5267bd42bf80b925722de582b5" into main
* changes:
  Merge "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior." into android14-tests-dev am: c2a27bd25a
  [RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior. am: 4c5eeb8346
2024-01-12 22:47:30 +00:00
Treehugger Robot
c400c439e3 Merge "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior." into android14-tests-dev am: c2a27bd25a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2908740

Change-Id: I484c3b10bd052c53e2cb670685e70870b876c87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 22:47:25 +00:00
Elliott Hughes
1c116ba64a [RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior. am: 4c5eeb8346
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2908740

Change-Id: Ib623cf4b4dda4791b0647b7c6d93543389431e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 22:47:23 +00:00
Kalesh Singh
f5146642e1 Merge "bionic: Add crt_pad_segment" into main 2024-01-12 22:23:08 +00:00
Treehugger Robot
c2a27bd25a Merge "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior." into android14-tests-dev 2024-01-12 22:22:42 +00:00
Elliott Hughes
4c5eeb8346 [RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior.
As long as 2024Q1 is using Android 14's CTS, Android 14's CTS needs to
work with both. That doesn't make much sense for this test of a bug fix,
so just disable it.

Bug: http://b/307680874
Test: treehugger
Change-Id: Ic1bea5d0404c91279a025ac97b521f07e4d2d387
2024-01-12 19:52:55 +00:00
Kalesh Singh
862a23dfdf bionic: Add crt_pad_segment
crt_pad_segment provides a note of type NT_ANDROID_TYPE_PAD_SEGMENT.
It's intended when present is for the loader to pad segment gaps to
reduce kernel slab memory usage (due to additional vm_area_struct's
for gaps). crt_pad_segment.o retains control to the static linker so
that app developers can opt out (build with different flags) it there
are undesireable side effects.

Section Headers:
  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al
  [ 0]                   NULL            0000000000000000 000000 000000 00      0   0  0
  [ 1] .strtab           STRTAB          0000000000000000 0000f8 000066 00      0   0  1
  [ 2] .text             PROGBITS        0000000000000000 000040 000000 00  AX  0   0  4
  [ 3] .note.GNU-stack   PROGBITS        0000000000000000 000040 000000 00      0   0  1
  [ 4] .note.android.pad_segment NOTE            0000000000000000 000040 00001c 00   A  0   0  4
  [ 5] .rela.note.android.pad_segment RELA            0000000000000000 0000e0 000018 18   I  7   4  8
  [ 6] .debug_line       PROGBITS        0000000000000000 00005c 000052 00      0   0  1
  [ 7] .symtab           SYMTAB          0000000000000000 0000b0 000030 18      1   1  8
Key to Flags:
  W (write), A (alloc), X (execute), M (merge), S (strings), I (info),
  L (link order), O (extra OS processing required), G (group), T (TLS),
  C (compressed), x (unknown), o (OS specific), E (exclude),
  D (mbind), l (large), p (processor specific)

Bug: 316403210
Test: m -j50 ndk
Test: find out/soong/ndk -name 'crt_pad_segment.o'
Test: readelf -SW crt_pag_segment.o
Change-Id: I94af5e85fd602e7ba5fd56788ae39277368229d8
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-01-12 10:22:08 -08:00
Elliott Hughes
f71f6cfea7 Merge "sys_statvfs_test: fix expectation for Linux 6.7." into main 2024-01-12 17:22:47 +00:00