Commit graph

36126 commits

Author SHA1 Message Date
Jiyong Park
ab54ea7118 Merge "Deprecate "/apex/<name>/ld.config.txt" am: 6c378ec6b5 am: f3aa9f3034
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2055645

Change-Id: Ia8931806b4f703dca76467a7ad48870b529bd93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:36:44 +00:00
Jiyong Park
f3aa9f3034 Merge "Deprecate "/apex/<name>/ld.config.txt" am: 6c378ec6b5
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2055645

Change-Id: I9c27b8781da80f483bcba03bbaa1c0419a4ce6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:10:10 +00:00
Jiyong Park
6c378ec6b5 Merge "Deprecate "/apex/<name>/ld.config.txt" 2022-04-05 23:46:09 +00:00
Jiyong Park
2bac1f81c1 Deprecate "/apex/<name>/ld.config.txt
The file is a manually created linker config file for the binaries in
the APEX. This is discouraged since such a manually created linker
config is error-prone and hard to maintain. Since the per-APEX
linker config file is automatically created by the linkerconfig tool as
/linkerconfig/<name>/ld.config.txt, we can safely deprecated the
fallback path.

There currently are two APEXes using these hand-crafted configs. They
can (and should) keep the configs for backwards compatibility; in case
when they run on older devices where the auto-generated configs are not
available. But for newer platforms, the files are simply ignored and no
new APEX should be using that.

Bug: 218933083
Test: m
Change-Id: I84bd8850b626a8506d53af7ebb86b158f6e6414a
2022-04-05 14:07:48 +09:00
Elliott Hughes
29fbe244ad Merge "Improve the documentation about adding trivial syscall wrappers." am: 8b8cb2d408 am: 738dee8670
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052355

Change-Id: Ie2b180fe11bdee52746e5c683d107a9c67000585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 18:31:43 +00:00
Elliott Hughes
738dee8670 Merge "Improve the documentation about adding trivial syscall wrappers." am: 8b8cb2d408
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052355

Change-Id: I6550b1d75889b3fd0ce617fab12b81b82c8a8345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 18:08:03 +00:00
Elliott Hughes
8b8cb2d408 Merge "Improve the documentation about adding trivial syscall wrappers." 2022-04-04 17:51:48 +00:00
TreeHugger Robot
21ec993d88 [automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: f2d36a84d3 -s ours
am skip reason: Merged-In I5cf8a129f1bcdadabeae64169f64274243841700 with SHA-1 eaa04f5da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/17544725

Change-Id: Ib1b4c9c48e227d01cae6677deb75ccf52b5b50df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 02:25:38 +00:00
Xin Li
9524342ef6 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 13c6d8fcc0 -s ours
am skip reason: Merged-In I5cf8a129f1bcdadabeae64169f64274243841700 with SHA-1 eaa04f5da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/17544725

Change-Id: I7f63f8d184ba6c27c7e9181d82289bacda5cf245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 02:24:33 +00:00
TreeHugger Robot
f2d36a84d3 Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 01:59:54 +00:00
Elliott Hughes
a96306c60d Improve the documentation about adding trivial syscall wrappers.
Test: treehugger
Change-Id: I49040d0284e1d1254b8571a699a44b43ea8d911b
2022-04-01 15:56:31 -07:00
Elliott Hughes
5437ec7a18 Merge "Fix unistd.exec_argv0_null for new kernels." am: 97ef479dfe am: 3a50e803dd
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052352

Change-Id: Ic2763f6caed5995b2cfd579ccf81368ac42016bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:36:58 +00:00
Elliott Hughes
3a50e803dd Merge "Fix unistd.exec_argv0_null for new kernels." am: 97ef479dfe
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052352

Change-Id: I3f99127ad853bed904351f98d4b249affed755a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:19:36 +00:00
Elliott Hughes
97ef479dfe Merge "Fix unistd.exec_argv0_null for new kernels." 2022-04-01 21:59:56 +00:00
Xin Li
13c6d8fcc0 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I5cf8a129f1bcdadabeae64169f64274243841700
Change-Id: I2a16e5ef0bb4be54c5e3565f6106b03de85e0f84
2022-04-01 20:31:48 +00:00
Elliott Hughes
bb1cc5a82c Fix unistd.exec_argv0_null for new kernels.
There are other options here (see the code comment for details), but
this is the least effort/least disruptive for now.

Bug: http://b/227498625
Test: treehugger
Change-Id: I33be6fbfc022238de2f1846a69af1e712a9d6391
2022-04-01 11:12:36 -07:00
Treehugger Robot
9a1d8e34df Merge "Extempt calculate_gnu_hash_neon from hwasan." am: 8581029d08 am: f6b9048ec3
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052349

Change-Id: I2ed09c20320c8ead4e21cd3468a34ee46f9b7ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 01:45:24 +00:00
Treehugger Robot
f6b9048ec3 Merge "Extempt calculate_gnu_hash_neon from hwasan." am: 8581029d08
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052349

Change-Id: I50d2151c24af784b77fbf765927d7d84fdc87da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 01:20:27 +00:00
Treehugger Robot
8581029d08 Merge "Extempt calculate_gnu_hash_neon from hwasan." 2022-04-01 00:56:45 +00:00
Florian Mayer
6e8f3a76ee Extempt calculate_gnu_hash_neon from hwasan.
Bug: 227630703
Change-Id: I525c99796c87252050b46faffb3058f7e8b5866c
2022-03-31 22:46:54 +00:00
Elliott Hughes
eaa04f5da3 Merge "C11 removed gets()." am: 6bdefa6ca2 am: 2d2b6a18d9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2050332

Change-Id: I5cf8a129f1bcdadabeae64169f64274243841700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 17:09:24 +00:00
Elliott Hughes
2d2b6a18d9 Merge "C11 removed gets()." am: 6bdefa6ca2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2050332

Change-Id: I91599ba17989e4c7e857aacb2436f861aa9c83de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 16:52:45 +00:00
Elliott Hughes
6bdefa6ca2 Merge "C11 removed gets()." 2022-03-31 16:30:43 +00:00
Elliott Hughes
1063039d19 C11 removed gets().
Test: treehugger
Change-Id: I793e29cbd52dd882b72eb58055cbc0dd05eb0f59
2022-03-30 17:25:10 -07:00
Ryan Prichard
f43a16923d Merge "Always process TLS relocs using general code path" am: df41909cf6 am: 0b2fdaacb5
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043591

Change-Id: I13e1a78b7194f2ff7f175762e086aa2e951bb36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:53:29 +00:00
Ryan Prichard
0b2fdaacb5 Merge "Always process TLS relocs using general code path" am: df41909cf6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043591

Change-Id: Iad266367292783e9b9fd988dd725e839099e2fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:37:31 +00:00
Ryan Prichard
df41909cf6 Merge "Always process TLS relocs using general code path" 2022-03-28 19:19:12 +00:00
Ryan Prichard
8ea6af53e2 Always process TLS relocs using general code path
This is important for enabling the error about unsupported TLS
relocations to local symbols. The fast path tends to skip this error,
because it fails during lookup_symbol(). Add a test for this error.

I didn't see a performance regression in the linker_relocation
benchmark.

Bug: http://b/226978634
Test: m bionic-unit-tests
Change-Id: Ibef9bde2973cf8c2d420ecc9e8fe2c69a5097ce2
2022-03-25 15:51:11 -07:00
Mitch Phillips
dc3eebbc13 Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" am: 98b49a060f am: b0a961ec00
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043303

Change-Id: Ic538ebcd92527b32a777918242029537d26a0056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:40:31 +00:00
Mitch Phillips
b0a961ec00 Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" am: 98b49a060f
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043303

Change-Id: Ibf3824aa177029632be8b9d3a870065bd1c0955d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:17:31 +00:00
Mitch Phillips
98b49a060f Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" 2022-03-25 17:57:07 +00:00
Mitch Phillips
40d9622c12 Add GWP-ASan CTS to bionic TEST_MAPPING
Bug: N/A
Change-Id: Ia9aac40965ba77823cd3824b0508d4e48c07f43f
Test: presubmit should pick up the new test in TEST_MAPPING.
2022-03-25 00:08:32 +00:00
Treehugger Robot
8766e86c78 Merge "Avoid usage of LONG_BIT in signal headers." am: 2b64e4000d am: e3893280a4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2038949

Change-Id: I6b7a6370fd0957aa26f887c989c40a31d06db937
Signed-off-by: Automerger Merge Worker
2022-03-24 21:40:34 +00:00
Treehugger Robot
e3893280a4 Merge "Avoid usage of LONG_BIT in signal headers." am: 2b64e4000d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2038949

Change-Id: I2077f3b2dfbf05ac26575d3f456bf1e9e0d81b81
Signed-off-by: Automerger Merge Worker
2022-03-24 21:24:45 +00:00
Treehugger Robot
2b64e4000d Merge "Avoid usage of LONG_BIT in signal headers." 2022-03-24 21:10:41 +00:00
Peter Collingbourne
08b968b282 Avoid usage of LONG_BIT in signal headers.
Clang has its own limits.h which is ahead of ours on the inclusion
path. This header uses include_next to include our header, but only
in hosted mode. This means that in freestanding mode we don't get our
limits.h macro definitions, including LONG_BIT. This ends up causing
our signal.h to produce errors when included in freestanding mode on
32-bit platforms.

Fix the errors by replacing usage of LONG_BIT with (8 * sizeof(long))
in the signal headers.

Change-Id: I18ec7b6876d5f862beae09f0c011128eef97c869
2022-03-24 11:11:11 -07:00
Christopher Ferris
6712c39c0c Merge "Update to v5.17 kernel headers." am: 9263a823ea am: ceed1d8ec0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2037786

Change-Id: I33b0ac629ed4f8426615e6bd06e4017cdf38a95f
2022-03-23 19:24:31 +00:00
Christopher Ferris
ceed1d8ec0 Merge "Update to v5.17 kernel headers." am: 9263a823ea
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2037786

Change-Id: Ie3d253811d84ee1c87557bceb5ad8164e0576a2c
2022-03-23 18:52:13 +00:00
Christopher Ferris
9263a823ea Merge "Update to v5.17 kernel headers." 2022-03-23 18:30:54 +00:00
Christopher Ferris
1ed5534657 Update to v5.17 kernel headers.
Kernel headers coming from:

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

Test: Boots on a flame and all bionic unit tests pass.
Change-Id: I7057d7308241f3acfa600597d287994c39ababbc
2022-03-22 16:48:40 -07:00
Treehugger Robot
efd79e1208 Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." am: 8397fadb2e am: 3510d87bd7
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2035563

Change-Id: I0aeb0b4ee104999fe76be8d594e55c26b0fd3da8
2022-03-22 21:17:24 +00:00
Treehugger Robot
3510d87bd7 Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." am: 8397fadb2e
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2035563

Change-Id: I46ec11d3e87e5ef52de34b845674a6eb5df41ed6
2022-03-22 20:38:52 +00:00
Treehugger Robot
8397fadb2e Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." 2022-03-22 20:25:30 +00:00
Peter Collingbourne
7aa3abc781 Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1.
This flag means "$ORIGIN processing required", and since we always
do that, we can claim support for it.

Change-Id: If60ef331963f6bc1e1818d7fa2ee57c1aa8fa343
2022-03-21 19:02:26 -07:00
Elliott Hughes
829eec4950 Merge changes from topic "revert-16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev-WCAVYOUACP" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Revert "Disable pointer authentication in app processes." 2p: af2f109a9c
  Revert "Disable pointer authentication in app processes."
2022-03-16 20:41:09 +00:00
Elliott Hughes
45732ed64c Merge "Revert "[automerged blank] Disable pointer authentication in app..."" into sc-v2-dev-plus-aosp 2022-03-16 20:41:09 +00:00
Treehugger Robot
1bb92d2fb3 Merge "Suppress -Wformat warning" am: 8321ff1468 am: 7923456b83
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2027237

Change-Id: Ieeb6a55894b0a15a378debd97815958d44b14e5f
2022-03-16 19:56:14 +00:00
Treehugger Robot
7923456b83 Merge "Suppress -Wformat warning" am: 8321ff1468
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2027237

Change-Id: If4822c76ccd467bb391bb35f9d0bc1bc0a8c01eb
2022-03-16 19:33:31 +00:00
Treehugger Robot
8321ff1468 Merge "Suppress -Wformat warning" 2022-03-16 18:55:05 +00:00
Yi Kong
f9b1313968 Suppress -Wformat warning
This is exactly what it is testing for.

Original warning:
  bionic/tests/stdio_test.cpp:370:47: error: '%n' specifier not supported on this platform [-Werror,-Wformat]
    EXPECT_DEATH(snprintf(buf, sizeof(buf), "a %n b", &i), "%n not allowed on Android");
                                               ~^

Test: presubmit
Bug: 219872355
Change-Id: I6e378722b2d681cf64f4cf31ef000bd28203b00d
2022-03-16 08:15:15 +00:00