Skip to content

Commit 6aa6389

Browse files
author
Your Name
committed
Bump to r28c
1 parent 7a710e9 commit 6aa6389

File tree

7 files changed

+109
-20
lines changed

7 files changed

+109
-20
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
if: ${{ failure() }}
3131
uses: mxschmitt/action-tmate@v3
3232
- name: Upload Build Archive
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: output-${{ github.sha }}
3636
path: ${{ github.workspace }}/output
@@ -50,7 +50,7 @@ jobs:
5050
sudo apt update
5151
sudo apt install -yq cmake ninja-build libzstd-dev
5252
- name: Fetch archives
53-
uses: actions/download-artifact@v3
53+
uses: actions/download-artifact@v4
5454
with:
5555
path: ./
5656
- name: Copy archives
@@ -64,12 +64,13 @@ jobs:
6464
- name: Build Flang
6565
env:
6666
BUILD_ARCH_OR_TYPE: ${{ matrix.target_arch_or_type }}
67+
JAVA_HOME: ${{ env.JAVA_HOME_17_X64 }}
6768
run: bash build-flang.sh
6869
- name: Waiting for debugger
6970
if: ${{ failure() }}
7071
uses: mxschmitt/action-tmate@v3
7172
- name: Upload Build Archive
72-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7374
with:
7475
name: output-flang-${{ matrix.target_arch_or_type }}-${{ github.sha }}
7576
path: ${{ github.workspace }}/output-flang
@@ -80,7 +81,7 @@ jobs:
8081
runs-on: ubuntu-22.04
8182
steps:
8283
- name: Fetch archives
83-
uses: actions/download-artifact@v3
84+
uses: actions/download-artifact@v4
8485
with:
8586
path: ./
8687
- name: Copy archives

‎build-flang.sh‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@
33
set -e -o pipefail -u
44

55
: ${BUILD_ARCH_OR_TYPE:=host}
6-
: ${DEFAULT_ANDROID_API_LEVEL:=21}
7-
: ${ANDROID_NDK:=~/lib/android-ndk-r27c}
6+
: ${DEFAULT_ANDROID_API_LEVEL:=24}
87
: ${FLANG_MAKE_PROCESSES:=1}
8+
: ${JAVA_HOME:=/usr/lib/jvm/java-17-openjdk-amd64}
9+
10+
# Setup Android NDK r28c
11+
export JAVA_HOME
12+
export ANDROID_NDK="$HOME/lib/android-ndk-r28c"
13+
export NDK="$ANDROID_NDK"
14+
_PACKAGES_COMMIT="f2468bfb3afea9c3cb1d200c799d25f529619689"
15+
git clone https://github.com/termux/termux-packages
16+
pushd termux-packages
17+
git checkout $_PACKAGES_COMMIT
18+
bash ./scripts/setup-android-sdk.sh
19+
popd # termux-packages
920

1021
patch -p1 -d $(pwd)/out/llvm-project < flang-undef-macros.patch
22+
patch -p1 -d $(pwd)/out/llvm-project < flang-undef-macros-2.patch
23+
patch -p1 -d $(pwd)/out/llvm-project < flang-use-libandroid-math-complex.patch
24+
patch -p1 -d $(pwd)/out/llvm-project < flang-dummy-bessel-functions-for-long-double.patch
1125

1226
ANDROID_TRIPLE="$BUILD_ARCH_OR_TYPE-linux-android"
1327
CC_HOST_PLATFORM=$BUILD_ARCH_OR_TYPE-linux-android$DEFAULT_ANDROID_API_LEVEL

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ git config --global color.ui false
1313
mkdir -p llvm-toolchain && cd llvm-toolchain
1414
repo init -u https://android.googlesource.com/platform/manifest
1515
# Modified the manifest xml, to ensure only contain linux component
16-
sed -E 's/(^.*?(darwin|mingw|windows).*$)/<!-- \1 -->/g' ../manifest_12470979.xml > .repo/manifests/test.xml
16+
sed -E 's/(^.*?(darwin|mingw|windows).*$)/<!-- \1 -->/g' ../manifest_13624864.xml > .repo/manifests/test.xml
1717
repo init -m test.xml
1818
repo sync -c
1919

2020
# Remove duplicated repo cache
2121
# rm -rf .repo
2222

2323
# Remove older version prebuilts
24-
rm -rf $(find prebuilts/clang/host/linux-x86/clang* -maxdepth 0 | grep -v "clang-r522817" | grep -v "clang-stable")
24+
rm -rf $(find prebuilts/clang/host/linux-x86/clang* -maxdepth 0 | grep -v "clang-r530567" | grep -v "clang-stable")
2525

2626
# Patch to build mlir
2727
patch -p1 < ../build-mlir.patch

‎flang-dummy-bessel-functions-for-long-double.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- a/flang/runtime/Float128Math/math-entries.h
2+
+++ b/flang/runtime/Float128Math/math-entries.h
3+
@@ -185,9 +185,11 @@
4+
DEFINE_SIMPLE_ALIAS(Ilogb, std::ilogb)
5+
DEFINE_SIMPLE_ALIAS(Isinf, std::isinf)
6+
DEFINE_SIMPLE_ALIAS(Isnan, std::isnan)
7+
+#ifndef __ANDROID__
8+
DEFINE_SIMPLE_ALIAS(J0, j0l)
9+
DEFINE_SIMPLE_ALIAS(J1, j1l)
10+
DEFINE_SIMPLE_ALIAS(Jn, jnl)
11+
+#endif
12+
DEFINE_SIMPLE_ALIAS(Ldexp, std::ldexp)
13+
DEFINE_SIMPLE_ALIAS(Lgamma, std::lgamma)
14+
DEFINE_SIMPLE_ALIAS(Llround, std::llround)
15+
@@ -204,9 +206,11 @@
16+
DEFINE_SIMPLE_ALIAS(Tanh, std::tanh)
17+
DEFINE_SIMPLE_ALIAS(Tgamma, std::tgamma)
18+
DEFINE_SIMPLE_ALIAS(Trunc, std::trunc)
19+
+#ifndef __ANDROID__
20+
DEFINE_SIMPLE_ALIAS(Y0, y0l)
21+
DEFINE_SIMPLE_ALIAS(Y1, y1l)
22+
DEFINE_SIMPLE_ALIAS(Yn, ynl)
23+
+#endif
24+
25+
// Use numeric_limits to produce infinity of the right type.
26+
#define F128_RT_INFINITY \

‎flang-undef-macros-2.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- a/flang/lib/Decimal/decimal-to-binary.cpp
2+
+++ b/flang/lib/Decimal/decimal-to-binary.cpp
3+
@@ -16,6 +16,8 @@
4+
#include <ctype.h>
5+
#include <utility>
6+
7+
+#undef HUGE
8+
+
9+
namespace Fortran::decimal {
10+
11+
template <int PREC, int LOG10RADIX>
12+
--- a/flang/lib/Decimal/big-radix-floating-point.h
13+
+++ b/flang/lib/Decimal/big-radix-floating-point.h
14+
@@ -30,6 +30,8 @@
15+
#include <limits>
16+
#include <type_traits>
17+
18+
+#undef HUGE
19+
+
20+
namespace Fortran::decimal {
21+
22+
static constexpr std::uint64_t TenToThe(int power) {

‎flang-use-libandroid-math-complex.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- a/flang/runtime/Float128Math/complex-math.h
2+
+++ b/flang/runtime/Float128Math/complex-math.h
3+
@@ -34,6 +34,23 @@
4+
#elif LDBL_MANT_DIG == 113
5+
/* Use 'long double' versions of libm functions. */
6+
#include <complex.h>
7+
+#if defined(__ANDROID__) && __ANDROID_API__ < 26
8+
+long double complex cacosl (long double complex);
9+
+long double complex cacoshl(long double complex);
10+
+long double complex casinl (long double complex);
11+
+long double complex casinhl(long double complex);
12+
+long double complex catanl (long double complex);
13+
+long double complex catanhl(long double complex);
14+
+long double complex ccosl (long double complex);
15+
+long double complex ccoshl (long double complex);
16+
+long double complex cexpl (long double complex);
17+
+long double complex clogl (long double complex);
18+
+long double complex cpowl (long double complex, long double complex);
19+
+long double complex csinl (long double complex);
20+
+long double complex csinhl (long double complex);
21+
+long double complex ctanl (long double complex);
22+
+long double complex ctanhl (long double complex);
23+
+#endif
24+
25+
#define CAbs(x) cabsl(x)
26+
#define CAcos(x) cacosl(x)

‎manifest_12470979.xml‎ renamed to ‎manifest_13624864.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@
55

66
<remote name="aosp" fetch="https://android.googlesource.com/" review="https://android.googlesource.com/" />
77

8-
<default revision="llvm-r522817" remote="aosp" sync-j="4" />
8+
<default revision="llvm-r530567" remote="aosp" sync-j="4" />
99

1010
<superproject name="platform/superproject" remote="aosp" />
1111

12-
<project path="bionic" name="platform/bionic" revision="de051b5d527ac72f949f3601dd2053fe11e312c1" />
12+
<project path="bionic" name="platform/bionic" revision="b86008a9cd14a7748867d2232e6de439e4809c10" />
1313

1414
<project path="toolchain/binutils" name="toolchain/binutils" revision="c19795e958ed532462948fd14b1bdfd4f6e96e03" />
1515

16-
<project path="toolchain/llvm-project" name="toolchain/llvm-project" revision="d8003a456d14a3deb8054cdaa529ffbf02d9b262" />
16+
<project path="toolchain/llvm-project" name="toolchain/llvm-project" revision="97a699bf4812a18fb657c2779f5296a4ab2694d2" />
1717

18-
<project path="toolchain/llvm_android" name="toolchain/llvm_android" revision="31a1d3747b77b10185c0adf03ae6036b474719c7" />
18+
<project path="toolchain/llvm_android" name="toolchain/llvm_android" revision="e727bfb014bd436f581a66a450c939a6983a1fc3" />
1919

2020
<project path="toolchain/common" name="toolchain/common" revision="0bce8b062126242872e9f3fc66760d3f76773c49" />
2121

2222
<project path="external/toolchain-utils" name="platform/external/toolchain-utils" revision="dd1ee45a84cb07337f9d5d0a6769d9b865c6e620" />
2323

2424
<project path="prebuilts/gcc/darwin-x86/host/headers" name="platform/prebuilts/gcc/darwin-x86/host/headers" groups="pdk,darwin" clone-depth="1" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
2525

26-
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="5a607ae02b1bc1670ecd802d9492c29adcc13e31" />
26+
<project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="7e960e32d11a3bc75b1ae3654b3b93c8828e2bb4" />
2727

2828
<project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" clone-depth="1" revision="54c8410ade95e313e892745f14312f5e97c7bedc" />
2929

3030
<project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" revision="7aea7e9880110799088cd1de509886871078306f" />
3131

3232
<project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" revision="b29ed51838737f0c8d0c689c50147e9bc128a31e" />
3333

34-
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" revision="657142822502c93ab603027e90d99006e441058d" />
34+
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" revision="ccbf6ad6af4430b013ddf35285f532f0bf535be9" />
3535

3636
<project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin,pdk,tradefed" clone-depth="1" revision="41f6d6bc9055f7e821b114233579e8456130eef8" />
3737

3838
<project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux,pdk,tradefed" clone-depth="1" revision="756ef2ad9a122c4b3cf359f80f92b3df6fc7bd4b" />
3939

40-
<project path="external/zstd" name="platform/external/zstd" revision="38ed4f43b1c8a40559aebded780baa563dd10747" />
40+
<project path="external/zstd" name="platform/external/zstd" revision="1ae0b70c04bdc9c17729f459c981c9f852bb9fca" />
4141

4242
<project path="external/libedit" name="platform/external/libedit" revision="892b8b381ae82ac3184900d989a516854d8b1197" />
4343

4444
<project path="external/swig" name="platform/external/swig" revision="d0f0f90be16c2ac553b5fa08512045273135147a" />
4545

4646
<project path="toolchain/xz" name="toolchain/xz" revision="47426872d1366c32538a8e9c8f559b03cb45b648" />
4747

48-
<project path="external/libxml2" name="platform/external/libxml2" revision="393a172b4d91f3677beb3d98568a94b08f014fcf" />
48+
<project path="external/libxml2" name="platform/external/libxml2" revision="cadf434ba9fcd9e3b3afbedea283a1eabf98872f" />
4949

5050
<project path="external/libncurses" name="platform/external/ncurses" revision="34cc24447dc9e5700110580c784d9606f6cff5f0" />
5151

@@ -55,15 +55,15 @@
5555

5656
<project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="6cf03be338b41e403770c097746e777c5c9ed9cb" />
5757

58-
<project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="b90de4eaf41af167619f40069e877372b1e32778" />
58+
<project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="aa855bf1b1d5f5976511a65fdad5fd420d13ba12" />
5959

60-
<project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="b6cafaac9b3c09f6cd81634f1cdd44606ae66d28" />
60+
<project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="5232748e9476fa1b9038046161d27b303c4fc170" />
6161

62-
<project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="37c7bd8f14cfdff5e653c78ed03ca329ce730cec" />
62+
<project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="24251f0f7faabefb024c4e2ceca6facd861de4cf" />
6363

6464
<project path="toolchain/prebuilts/ndk/releases" name="toolchain/prebuilts/ndk/releases" clone-depth="1" revision="e98ef7e0275b506b8843f2d0d52f3256e46df4b5" />
6565

66-
<project path="tools/repohooks" name="platform/tools/repohooks" revision="eee438b68bc9c55036016d681269ee8c261c94ff" />
66+
<project path="tools/repohooks" name="platform/tools/repohooks" revision="e22fc7f6ed4b6d67a8f1ab0c2437ecaf62e9c60b" />
6767

6868
<project path="toolchain/prebuilts/sysroot/platform/riscv64-linux-android" name="toolchain/prebuilts/sysroot/platform/riscv64-linux-android" revision="d19c6ae1817af6846099905de2a422eae1de5d11" />
6969

0 commit comments

Comments
 (0)