Skip to content

Commit

Permalink
8283929: GHA: Add RISC-V build config
Browse files Browse the repository at this point in the history
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
  • Loading branch information
zifeihan authored and RealFYang committed Feb 23, 2024
1 parent 309291f commit ce3a667
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .github/workflows/build-cross-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
- arm
- s390x
- ppc64le
- riscv64
include:
- target-cpu: aarch64
gnu-arch: aarch64
Expand All @@ -76,6 +77,11 @@ jobs:
debian-arch: ppc64el
debian-repository: https://httpredir.debian.org/debian/
debian-version: bullseye
- target-cpu: riscv64
gnu-arch: riscv64
debian-arch: riscv64
debian-repository: https://httpredir.debian.org/debian/
debian-version: sid

steps:
- name: 'Checkout the JDK source'
Expand Down
9 changes: 8 additions & 1 deletion make/autoconf/build-aux/config.sub
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -40,6 +40,13 @@ if echo $* | grep pc-msys >/dev/null ; then
exit
fi

# Canonicalize for riscv which autoconf-config.sub doesn't handle
if echo $* | grep '^riscv\(32\|64\)-linux' >/dev/null ; then
result=`echo $@ | sed 's/linux/unknown-linux/'`
echo $result
exit
fi

# First, filter out everything that doesn't begin with "aarch64-"
if ! echo $* | grep '^aarch64-' >/dev/null ; then
. $DIR/autoconf-config.sub "$@"
Expand Down

0 comments on commit ce3a667

Please sign in to comment.