From 26755a968665545a151adce79a5227c79724bb6b Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Mon, 8 May 2023 14:00:05 +0000 Subject: [PATCH] 8306408: Fix the format of several tables in building.md Reviewed-by: erikj --- doc/building.html | 157 ++++++++++++++++++++++++---------------------- doc/building.md | 58 ++++++++--------- 2 files changed, 111 insertions(+), 104 deletions(-) diff --git a/doc/building.html b/doc/building.html index f1f9047808b..1aaf1d100bb 100644 --- a/doc/building.html +++ b/doc/building.html @@ -353,22 +353,22 @@ to date at the time of writing.

- - + + - - + + - - + + - - + +
Operating systemVendor/version usedOperating systemVendor/version used
LinuxOracle Enterprise Linux 6.4 / 7.6LinuxOracle Enterprise Linux 6.4 / 7.6
macOSMac OS X 10.13 (High Sierra)macOSMac OS X 10.13 (High Sierra)
WindowsWindows Server 2012 R2WindowsWindows Server 2012 R2
@@ -1195,27 +1195,27 @@ following targets are known to work:

- + - + - + - + - + - + - +
Supported devkit targetsSupported devkit targets
x86_64-linux-gnux86_64-linux-gnu
aarch64-linux-gnuaarch64-linux-gnu
arm-linux-gnueabihfarm-linux-gnueabihf
ppc64-linux-gnuppc64-linux-gnu
ppc64le-linux-gnuppc64le-linux-gnu
s390x-linux-gnus390x-linux-gnu
@@ -1417,112 +1417,119 @@ example ${sysroot}/usr/lib/${target}/

Architectures that are known to successfully cross-compile like this are:

+++++++ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/doc/building.md b/doc/building.md index 142ff7daf36..a1180ae7056 100644 --- a/doc/building.md +++ b/doc/building.md @@ -162,11 +162,11 @@ This table lists the OS versions used by Oracle when building the JDK. Such information is always subject to change, but this table is up to date at the time of writing. - Operating system Vendor/version used - ----------------- ------------------------------------------------------- - Linux Oracle Enterprise Linux 6.4 / 7.6 - macOS Mac OS X 10.13 (High Sierra) - Windows Windows Server 2012 R2 +| Operating system | Vendor/version used | +| ----------------- | ---------------------------------- | +| Linux | Oracle Enterprise Linux 6.4 / 7.6 | +| macOS | Mac OS X 10.13 (High Sierra) | +| Windows | Windows Server 2012 R2 | The double version numbers for Linux are due to the hybrid model used at Oracle, where header files and external libraries from an older version @@ -970,14 +970,14 @@ https://sourceware.org/autobook/autobook/autobook_17.html). If no targets are given, a native toolchain for the current platform will be created. Currently, at least the following targets are known to work: - Supported devkit targets - ------------------------- - x86_64-linux-gnu - aarch64-linux-gnu - arm-linux-gnueabihf - ppc64-linux-gnu - ppc64le-linux-gnu - s390x-linux-gnu +| Supported devkit targets | +| ------------------------ | +| x86_64-linux-gnu | +| aarch64-linux-gnu | +| arm-linux-gnueabihf | +| ppc64-linux-gnu | +| ppc64le-linux-gnu | +| s390x-linux-gnu | `BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or "Fedora" (if not specified "OEL6" will be the default). If the base OS @@ -1204,22 +1204,22 @@ it might require a little nudge with: Architectures that are known to successfully cross-compile like this are: - Target Debian tree Debian arch `--openjdk-target=...` `--with-jvm-variants=...` - ------------ ------------ ------------- ------------------------ -------------- - x86 buster i386 i386-linux-gnu (all) - arm buster armhf arm-linux-gnueabihf (all) - aarch64 buster arm64 aarch64-linux-gnu (all) - ppc64le buster ppc64el powerpc64le-linux-gnu (all) - s390x buster s390x s390x-linux-gnu (all) - mipsle buster mipsel mipsel-linux-gnu zero - mips64le buster mips64el mips64el-linux-gnueabi64 zero - armel buster arm arm-linux-gnueabi zero - ppc sid powerpc powerpc-linux-gnu zero - ppc64be sid ppc64 powerpc64-linux-gnu (all) - m68k sid m68k m68k-linux-gnu zero - alpha sid alpha alpha-linux-gnu zero - sh4 sid sh4 sh4-linux-gnu zero - riscv64 sid riscv64 riscv64-linux-gnu (all) +| Target | Debian tree | Debian arch | `--openjdk-target=...` | `--with-jvm-variants=...` | +| ------------ | ------------ | ------------- | ------------------------ | ------------------------- | +| x86 | buster | i386 | i386-linux-gnu | (all) | +| arm | buster | armhf | arm-linux-gnueabihf | (all) | +| aarch64 | buster | arm64 | aarch64-linux-gnu | (all) | +| ppc64le | buster | ppc64el | powerpc64le-linux-gnu | (all) | +| s390x | buster | s390x | s390x-linux-gnu | (all) | +| mipsle | buster | mipsel | mipsel-linux-gnu | zero | +| mips64le | buster | mips64el | mips64el-linux-gnueabi64 | zero | +| armel | buster | arm | arm-linux-gnueabi | zero | +| ppc | sid | powerpc | powerpc-linux-gnu | zero | +| ppc64be | sid | ppc64 | powerpc64-linux-gnu | (all) | +| m68k | sid | m68k | m68k-linux-gnu | zero | +| alpha | sid | alpha | alpha-linux-gnu | zero | +| sh4 | sid | sh4 | sh4-linux-gnu | zero | +| riscv64 | sid | riscv64 | riscv64-linux-gnu | (all) | ### Building for ARM/aarch64
TargetDebian treeDebian arch--openjdk-target=...TargetDebian treeDebian arch--openjdk-target=... --with-jvm-variants=...
x86busteri386i386-linux-gnux86busteri386i386-linux-gnu (all)
armbusterarmhfarm-linux-gnueabihfarmbusterarmhfarm-linux-gnueabihf (all)
aarch64busterarm64aarch64-linux-gnuaarch64busterarm64aarch64-linux-gnu (all)
ppc64lebusterppc64elpowerpc64le-linux-gnuppc64lebusterppc64elpowerpc64le-linux-gnu (all)
s390xbusters390xs390x-linux-gnus390xbusters390xs390x-linux-gnu (all)
mipslebustermipselmipsel-linux-gnumipslebustermipselmipsel-linux-gnu zero
mips64lebustermips64elmips64el-linux-gnueabi64mips64lebustermips64elmips64el-linux-gnueabi64 zero
armelbusterarmarm-linux-gnueabiarmelbusterarmarm-linux-gnueabi zero
ppcsidpowerpcpowerpc-linux-gnuppcsidpowerpcpowerpc-linux-gnu zero
ppc64besidppc64powerpc64-linux-gnuppc64besidppc64powerpc64-linux-gnu (all)
m68ksidm68km68k-linux-gnum68ksidm68km68k-linux-gnu zero
alphasidalphaalpha-linux-gnualphasidalphaalpha-linux-gnu zero
sh4sidsh4sh4-linux-gnush4sidsh4sh4-linux-gnu zero
riscv64sidriscv64riscv64-linux-gnuriscv64sidriscv64riscv64-linux-gnu (all)