Skip to content

Commit 056b0af

Browse files
rui314claude
andcommitted
Fix CI
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 447e099 commit 056b0af

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

test/use-android-relr-tags.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@ EOF
1111
# Probe whether the host toolchain can link a PIE; skip if not.
1212
$CC -o $t/probe $t/a.o -pie 2> /dev/null || skip
1313

14-
# Default: standard DT_RELR tags (35/36/37) and SHT_RELR (19).
14+
# Default: standard DT_RELR tags (35/36/37).
1515
$CC -B. -o $t/exe1 $t/a.o -pie -Wl,--pack-dyn-relocs=relr
16-
readelf -SW $t/exe1 | grep -F .relr.dyn | grep -Ew 'RELR'
16+
readelf -SW $t/exe1 | grep -F .relr.dyn
1717
readelf --dynamic $t/exe1 > $t/log1
1818
grep -Ew 'RELR|<unknown>: 24' $t/log1
1919
grep -Ew 'RELRSZ|<unknown>: 23' $t/log1
2020
grep -Ew 'RELRENT|<unknown>: 25' $t/log1
2121

22-
# --use-android-relr-tags: legacy DT_ANDROID_RELR* (in the OS-specific
23-
# range) and SHT_ANDROID_RELR section type, for compatibility with
24-
# pre-Android-12 loaders that don't recognize the standard tags.
22+
# --use-android-relr-tags: legacy DT_ANDROID_RELR* tags (in the
23+
# OS-specific range), for compatibility with pre-Android-12 loaders
24+
# that don't recognize the standard tags. Match by raw hex value because
25+
# older readelf doesn't know the symbolic names.
2526
$CC -B. -o $t/exe2 $t/a.o -pie \
2627
-Wl,--pack-dyn-relocs=relr -Wl,--use-android-relr-tags
27-
readelf -SW $t/exe2 | grep -F .relr.dyn | grep -Ev '\bRELR\b'
28+
readelf -SW $t/exe2 | grep -F .relr.dyn
2829
readelf --dynamic $t/exe2 > $t/log2
2930
grep -E '0x0*6fffe000\b' $t/log2
3031
grep -E '0x0*6fffe001\b' $t/log2

0 commit comments

Comments
 (0)