Skip to content

Commit 634ad0d

Browse files
authored
Add aarch64-pc-cygwin target to advanced.yml (#123)
1 parent 0d2ec35 commit 634ad0d

File tree

5 files changed

+30
-3
lines changed

5 files changed

+30
-3
lines changed

.github/scripts/binutils/build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$BINUTILS_BUILD_PATH/Makefile" ]]; then
3939
;;
4040
esac
4141

42+
case "$ARCH-$PLATFORM" in
43+
aarch64-*cygwin*)
44+
# ADDED: --enable-targets=aarch64-pep
45+
# ADDED: --disable-sim
46+
TARGET_OPTIONS="$TARGET_OPTIONS \
47+
--enable-targets=aarch64-pep \
48+
--disable-sim"
49+
;;
50+
esac
51+
4252
$SOURCE_PATH/binutils/configure \
4353
--prefix=$TOOLCHAIN_PATH \
4454
--build=$BUILD \

.github/scripts/toolchain/build-cygwin.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
1313
echo "::group::Configure Cygwin"
1414
rm -rf $CYGWIN_BUILD_PATH/*
1515

16+
if [ "$DEBUG" = 1 ] ; then
17+
HOST_OPTIONS="$HOST_OPTIONS \
18+
--enable-debug \
19+
--disable-lto"
20+
fi
21+
1622
(cd $CYGWIN_SOURCE_PATH/winsup && ./autogen.sh)
1723
if [[ "$STAGE" = "1" ]]; then
1824
(cd $CYGWIN_SOURCE_PATH && patch -p1 -i $PATCHES_PATH/cygwin/0001-fix-autogen.patch)
@@ -33,6 +39,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$CYGWIN_BUILD_PATH/Makefile" ]]; then
3339
--with-sysroot=$TOOLCHAIN_PATH \
3440
--with-build-sysroot=$TOOLCHAIN_PATH \
3541
--with-cross-bootstrap \
42+
$HOST_OPTIONS \
3643
$TARGET_OPTIONS
3744
echo "::endgroup::"
3845
fi

.github/scripts/toolchain/build-gcc.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
3232
case "$PLATFORM" in
3333
*linux*)
3434
TARGET_OPTIONS="$TARGET_OPTIONS \
35+
--enable-shared \
3536
--enable-threads=posix"
3637
;;
3738
*cygwin*)
3839
# REMOVED: --libexecdir=/usr/lib
40+
# REMOVED: --enable-shared for aarch64-pc-cygwin
3941
# CHANGED: --enable-__cxa_atexit to --disable-__cxa_atexit
4042
TARGET_OPTIONS="$TARGET_OPTIONS \
4143
--enable-shared-libgcc \
@@ -61,6 +63,7 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
6163
*mingw*)
6264
TARGET_OPTIONS="$TARGET_OPTIONS \
6365
--libexecdir=$TOOLCHAIN_PATH/lib \
66+
--enable-shared \
6467
--enable-threads=win32 \
6568
--enable-graphite \
6669
--enable-fully-dynamic-string \
@@ -89,6 +92,14 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
8992
TARGET_OPTIONS="$TARGET_OPTIONS \
9093
--disable-libsanitizer"
9194
;;
95+
aarch64-pc-cygwin)
96+
TARGET_OPTIONS="$TARGET_OPTIONS \
97+
--disable-shared"
98+
;;
99+
x86_64-pc-cygwin)
100+
TARGET_OPTIONS="$TARGET_OPTIONS \
101+
--enable-shared"
102+
;;
92103
esac
93104

94105
# REMOVED: --enable-languages=ada,go,jit
@@ -98,7 +109,6 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$GCC_BUILD_PATH/Makefile" ]]; then
98109
--host=$HOST \
99110
--target=$TARGET \
100111
--enable-static \
101-
--enable-shared \
102112
--enable-languages=c,c++,d,fortran,lto,m2,objc,obj-c++ \
103113
--disable-bootstrap \
104114
--disable-multilib \

.github/scripts/toolchain/build-mingw-crt.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ if [[ "$RUN_INSTALL" = 1 ]]; then
8989
ln -fs w32api/libuserenv.a .
9090
ln -fs w32api/libnetapi32.a .
9191
ln -fs w32api/libdbghelp.a .
92+
ln -fs w32api/libonecore.a .
93+
ln -fs w32api/libpdh.a .
9294
popd
9395
;;
9496
esac

.github/workflows/advanced.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ jobs:
146146
crt: ucrt
147147
- platform: pc-cygwin
148148
crt: libc
149-
- platform: pc-cygwin
150-
arch: aarch64
151149

152150
env:
153151
ARCH: ${{ matrix.arch }}

0 commit comments

Comments
 (0)