[android] Fix PIC test for Android ARMv7/AArch64 #23614
Conversation
|
I think I would rather see it duplicated. Making the |
drodriguez
force-pushed
the
android-fix-pic-test
branch
from
8b6626f to
8d41b22
Compare
|
Split the test into Linux/Windows/Android (iOS should use |
|
@drodriguez @compnerd This test also needs fixing for Linux/AArch64 |
For the AArch64 test, the only change is making the @page piece optional. LLVM doesn't seem to generate that part when targetting Android or Linux. For the ARMv7 tests, it is a little bit more complicated. Android seems to use a different structure for PIC, which involve two labels and instructions which are not movw/movt. To keep the iOS test undisturbed, I added an extra check for the target-sdk-name. That allows iOS to be the same, and Android to have their own checks. For Linux (the only other SDK I can find that targets ARMv7), I used the Android solution, because that seems to be what LLVM generates when using armv7-none-linux.
drodriguez
force-pushed
the
android-fix-pic-test
branch
from
8d41b22 to
0dee84a
Compare
|
Done. I wonder if Windows do not have the @compnerd: can you restart the tests and review this again for merging (last Android AArch64 test failing!) |
|
Great, thanks. |
|
@swift-ci please test |
|
Build failed |
For the AArch64 test, the only change is making the @page piece
optional. LLVM doesn't seem to generate that part when targetting
Android.
For the ARMv7 tests, it is a little bit more complicated. Android seems
to use a different structure for PIC, which involve two labels and
instructions which are not movw/movt. To keep the iOS test undisturbed,
I added an extra check for the target-sdk-name. That allows iOS to be
the same, and Android to have their own checks. For Linux (the only
other SDK I can find that targets ARMv7), I used the Android solution,
because that seems to be what LLVM generates when using
armv7-none-linux.