Skip to content

Commit ce3a667

Browse files
zifeihanRealFYang
authored andcommitted
8283929: GHA: Add RISC-V build config
8313701: GHA: RISC-V should use the official repository for bootstrap 8285630: Fix a configure error in RISC-V cross build Reviewed-by: fyang, luhenry Backport-of: 85d4b49151e9529051f1ed344749a487d3e92165
1 parent 309291f commit ce3a667

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/build-cross-compile.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
- arm
5555
- s390x
5656
- ppc64le
57+
- riscv64
5758
include:
5859
- target-cpu: aarch64
5960
gnu-arch: aarch64
@@ -76,6 +77,11 @@ jobs:
7677
debian-arch: ppc64el
7778
debian-repository: https://httpredir.debian.org/debian/
7879
debian-version: bullseye
80+
- target-cpu: riscv64
81+
gnu-arch: riscv64
82+
debian-arch: riscv64
83+
debian-repository: https://httpredir.debian.org/debian/
84+
debian-version: sid
7985

8086
steps:
8187
- name: 'Checkout the JDK source'

make/autoconf/build-aux/config.sub

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,13 @@ if echo $* | grep pc-msys >/dev/null ; then
4040
exit
4141
fi
4242

43+
# Canonicalize for riscv which autoconf-config.sub doesn't handle
44+
if echo $* | grep '^riscv\(32\|64\)-linux' >/dev/null ; then
45+
result=`echo $@ | sed 's/linux/unknown-linux/'`
46+
echo $result
47+
exit
48+
fi
49+
4350
# First, filter out everything that doesn't begin with "aarch64-"
4451
if ! echo $* | grep '^aarch64-' >/dev/null ; then
4552
. $DIR/autoconf-config.sub "$@"

0 commit comments

Comments
 (0)