scripts: add termux_setup_gnu_as_23c for NDK r25 #11615

truboxl · 2022-08-15T23:23:59Z

Fixes #11614
Fixes #11587

truboxl · 2022-08-16T01:52:22Z

Not building Arm with custom assembly might have performance penalty... --disable-arm-simd --disable-arm-neon

Next step either choose:

Go ahead build without custom assembly
Patch all the assembly files to be LLVM compatible
Bring back GAS from NDK r23c or another source (can be from Ubuntu package or static build)

truboxl · 2022-08-17T12:23:39Z

I added back GAS from NDK r23c... Seems to work fine with NDK r25...

Grimler91

Thanks for looking into this!

Editing/enhancing the ndk really should only be dons as a last resort I think, would be better to fix the assembly in the affected packages, but obviously that isn't trivial.

So, this seems like a good approach for me where we would otherwise have to disable assembly and get massive penalties

Grimler91 · 2022-08-17T19:24:33Z

scripts/build/setup/termux_setup_gnu_as.sh

+		# 1. bin/*-linux-android*-as
+		# 2. *-linux-android*/bin/as (symlink to #1)
+		# 3. lib/gcc/*-linux-android*/4.9.x/crtbegin.o (dummy file)
+		cp -f "$NDK"/toolchains/llvm/prebuilt/linux-x86_64/bin/{arm-linux-androideabi,{aarch64,i686,x86_64}-linux-android}-as \


I think it would be better to add this stuff to a separate folder (maybe something like ~/.termux-build/_cache/android-r23c-gas-api-24-v0) to make it similar to what we do for the ndk toolchain.

Useful if we need to download a separate ndk version for some packages.

termux_step_ functions should be the ones run from build-package.sh, while non step functions are run from within other functions, or in build recipes.

And update PATH so as is found. Co-authored-by: Henrik Grimler <grimler@termux.dev>

truboxl · 2022-08-24T00:15:00Z

Apparently openssl has a typo ASLAGS instead of ASFLAGS which supposedly should be CFLAGS and fno-integrated-as never worked 😅

Remove it since its no longer needed

I still need to refine the comments

truboxl · 2022-08-24T13:16:45Z

Added a small repro case to determine clang does detect the GCC toolchain (in this case GAS only) so it should clear up the confusion whether the path is needed in the first place.

Will squash all this into one commit if everybody agrees.

Grimler91

Nice work, looks good to me!

if [ ! -d "$NDK" ]; then, that I added, can be removed as well, as setup-android-sdk already checks the same thing (see comment)

Grimler91 · 2022-08-24T13:49:24Z

scripts/build/toolchain/termux_setup_gnu_as_23c.sh

+	local GAS_TOOLCHAIN_REVISION="-v0"
+	local GAS_TOOLCHAIN_DIR="$TERMUX_COMMON_CACHEDIR/android-r23c-gas-api-${TERMUX_PKG_API_LEVEL}${GAS_TOOLCHAIN_REVISION}"
+	local NDK="$(dirname "$NDK")"/android-ndk-r23c
+	if [ ! -d "$NDK" ]; then


this if (that I added) is unnecessary, setup-android-sdk.sh already checks if folder exists

truboxl · 2022-08-24T15:21:21Z

Gah... messed up the commit message... welp

NDK r25 has removed GNU Assembler (GAS). Removal of GAS introduced a number of build issues. The most prominent is: /usr/bin/as: unrecognized option '-EL' Some options to solve this: 1. Disable building custom assembly and suffer performance penalty 2. Hand rewrite the custom assembly to be LLVM compatible 3. Wait for upstream to write LLVM compatible assembly (openssl, openssl-1.1) 4. Bring back GAS from NDK r23c In this commit, GAS is brought back as a separate toolchain instead of following NDK r23c file hierarchy. We pass "--gcc-toolchain=GAS_TOOLCHAIN_DIR" to NDK r25 clang to detect. Packages only have to add "termux_step_gnu_as_23c" to build.sh to enable GAS. In the future, we expect packages should follow option 3 more than option 4 as that is a last resort. This commit also bumps revision for packages that rely (or previously rely) on "-fno-integrated-as": hors, libffi, libgcrypt, libpixman, openssl, openssl-1.1 Co-authored-by: Henrik Grimler <grimler@termux.dev> Co-authored-by: Chongyun Lee <45286352+licy183@users.noreply.github.com>

truboxl requested review from finagolfin, Grimler91, landfillbaby and 2096779623 as code owners August 15, 2022 23:24

truboxl force-pushed the libpixman-ndk-r25 branch 2 times, most recently from 1f0004c to 039fd7c Compare August 16, 2022 00:31

truboxl marked this pull request as draft August 16, 2022 00:37

truboxl force-pushed the libpixman-ndk-r25 branch from 039fd7c to 2eec541 Compare August 16, 2022 00:48

truboxl force-pushed the libpixman-ndk-r25 branch 15 times, most recently from 223a802 to 3d1d436 Compare August 17, 2022 12:17

truboxl marked this pull request as ready for review August 17, 2022 12:22

truboxl mentioned this pull request Aug 17, 2022

[Bug]: libgcrypt build failed ndk25 #11587

Closed

Grimler91 reviewed Aug 17, 2022

View reviewed changes

truboxl marked this pull request as draft August 18, 2022 06:39

truboxl force-pushed the libpixman-ndk-r25 branch from 3d1d436 to 082366f Compare August 18, 2022 14:11

truboxl and others added 7 commits August 23, 2022 23:03

chore(main/libpixman): bump to rebuild with NDK r25

ec6c176

chore(main/libgcrypt): bump to rebuild with NDK r25

bc1fd97

scripts: make it possible to override NDK variables

97bd82a

Useful if we need to download a separate ndk version for some packages.

scripts: setup_toolchain_with_gas: no need to override NDK vars

b4e9910

scripts: toolchains: rm "step" from function names

bd1c689

termux_step_ functions should be the ones run from build-package.sh, while non step functions are run from within other functions, or in build recipes.

scripts: install gnu as in a separate folder

3a29dc2

And update PATH so as is found. Co-authored-by: Henrik Grimler <grimler@termux.dev>

make it really robust

0d1b991

truboxl force-pushed the libpixman-ndk-r25 branch from a3d7704 to 0d1b991 Compare August 23, 2022 15:06

truboxl added 2 commits August 23, 2022 23:29

change slightly the description

4b89155

test other packages that use fno-integrated-as

8336625

truboxl requested a review from kcubeterm as a code owner August 23, 2022 22:48

truboxl added 5 commits August 24, 2022 06:53

hors: add termux_setup_gnu_as_23c

ef664f3

libffi: add termux_setup_gnu_as_23c

c3da51e

openssl-1.1: add termux_setup_gnu_as_23c

6c56d2b

openssl: is it really ASFLAGS or CFLAGS?

420b79e

openssl: do we still need fno-integrated-as for arm?

55b9265

openssl-1.1: try remove fno-integrated-as

83b2ffc

truboxl changed the title ~~chore(main): bump libpixman, libgcrypt to rebuild with NDK r25~~ chore(main): bump hors, libffi, libgcrypt, libpixman, openssl-1.1, openssl to rebuild with NDK r25 Aug 24, 2022

fixup comments

ec0d8f1

truboxl changed the title ~~chore(main): bump hors, libffi, libgcrypt, libpixman, openssl-1.1, openssl to rebuild with NDK r25~~ scripts: add termux_setup_gnu_as_23c for NDK r25 Aug 24, 2022

Grimler91 reviewed Aug 24, 2022

View reviewed changes

remove if not NDK dir guard

e0ff85a

truboxl mentioned this pull request Aug 24, 2022

[Bug]: Building apt fails with configure: exit code 77 #11713

Closed

truboxl merged commit 035c918 into termux:master Aug 24, 2022

truboxl deleted the libpixman-ndk-r25 branch August 24, 2022 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

scripts: add termux_setup_gnu_as_23c for NDK r25 #11615

scripts: add termux_setup_gnu_as_23c for NDK r25 #11615

truboxl commented Aug 15, 2022 •

edited

Loading

truboxl commented Aug 16, 2022 •

edited

Loading

truboxl commented Aug 17, 2022

Grimler91 left a comment

Grimler91 Aug 17, 2022

truboxl commented Aug 24, 2022 •

edited

Loading

truboxl commented Aug 24, 2022

Grimler91 left a comment

Grimler91 Aug 24, 2022

truboxl commented Aug 24, 2022

scripts: add termux_setup_gnu_as_23c for NDK r25 #11615

scripts: add termux_setup_gnu_as_23c for NDK r25 #11615

Conversation

truboxl commented Aug 15, 2022 • edited Loading

truboxl commented Aug 16, 2022 • edited Loading

truboxl commented Aug 17, 2022

Grimler91 left a comment

Choose a reason for hiding this comment

Grimler91 Aug 17, 2022

Choose a reason for hiding this comment

truboxl commented Aug 24, 2022 • edited Loading

truboxl commented Aug 24, 2022

Grimler91 left a comment

Choose a reason for hiding this comment

Grimler91 Aug 24, 2022

Choose a reason for hiding this comment

truboxl commented Aug 24, 2022

truboxl commented Aug 15, 2022 •

edited

Loading

truboxl commented Aug 16, 2022 •

edited

Loading

truboxl commented Aug 24, 2022 •

edited

Loading