[GlobalTechInfo]

Summary

Two proot fixes, both needed before distro sessions work on 32-bit devices
and before rm -rf works in .git trees:

1. TLS underalignment crash — bionic's ARM32/ARM64 static-TLS layout
   check (StaticTlsLayout::reserve_exe_segment_and_tcb in
   bionic_elf_tls.cpp) aborts executables whose PT_TLS is underaligned;
   it gates on p_align and the vaddr skew together. A plain NDK
   link emits p_align 8 with a 16-aligned vaddr, so armv7 sessions died
   at proot startup ("executable's TLS segment is underaligned ... needs
   to be at least 32 for ARM Bionic").
2. rm -rf .git/objects/pack → EPERM — a link2symlink/fake_id0
   issue fixed only in the commit series between d4d2a19 and
   3c6aa6f (notably 968ae1b "link symbolic links as symbolic links", the fake_id0 statx/chmod-record series, 32-bit getdents
   parsing). The previous binaries were built from d4d2a19, which
   predates all of it.

All four libproot.so are now built from proot 3c6aa6f with the
TLS alignment applied.

Changes

• native/proot-tls-align-armv7a.ld, native/proot-tls-align-i686.ld:
  full lld-compatible layout scripts; .tdata/.tbss start-aligned at
  32 (skew 0), 16 KB data-segment alignment
• native/build-proot.sh: PROOT_VERSION bumped to 3c6aa6f; the
  -Wl,-T script is baked into the main link; 32-bit branch verifies
  p_align/vaddr instead of a dead ld.bfd re-link (the NDK ships no
  ld.bfd); ABI case fixed (i686's ABI is x86); the 64-bit p_align
  patch writes the file back and its vaddr-64 hard guard now applies to
  arm64 only (i386/x86_64 have no bionic TLS gate; x86_64 links with a
  32-aligned vaddr and is stamped p_align 64 without aborting); loader
  page-size injection is idempotent
• app/src/main/jniLibs/*/ — all four ABIs rebuilt and verified:
  • arm64-v8a: PT_TLS p_align 64, vaddr 64-aligned
  • armeabi-v7a: PT_TLS p_align 32, vaddr skew 0
  • x86: PT_TLS p_align 32, vaddr skew 0
  • x86_64: PT_TLS p_align 64 (vaddr 32-aligned; no gate on i386/x86_64)
    All ET_EXEC, every LOAD 16 KB-page aligned, entry at bionic's static
    _start, .tdata template bytes preserved

How it was tested

• TLS check cross-referenced against bionic platform source; .tdata
  contents byte-identical before/after the re-link; clean
  ./gradlew clean assembleDebug with zero compiler warnings; APK
  libproot.so md5-identical to jniLibs for all four ABIs
• Pending: on-device verification of rm -rf on the affected device
  (the TLS crash itself is already confirmed gone on the rebuilt
  arm64 binary)

Checklist

• ./gradlew assembleDebug clean build passes; lintDebug not run
  in this pass
• CHANGELOG.md updated under ## [Unreleased] if user-visible
  (deliberately untouched until the on-device verification lands,
  per project convention)
• No unrelated changes included

[coderabbitai]

Caution

Review failed

The pull request is closed.

Finishing Touches

📝 Generate docstrings

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}