Skip to content

Commit 26755a9

Browse files
DingliZhangerikj79
DingliZhang
authored and
erikj79
committed
8306408: Fix the format of several tables in building.md
Reviewed-by: erikj
1 parent 64c0962 commit 26755a9

File tree

2 files changed

+111
-104
lines changed

2 files changed

+111
-104
lines changed

‎doc/building.html‎

Lines changed: 82 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -353,22 +353,22 @@ <h2 id="operating-system-requirements">Operating System
353353
<table>
354354
<thead>
355355
<tr class="header">
356-
<th style="text-align: left;">Operating system</th>
357-
<th style="text-align: left;">Vendor/version used</th>
356+
<th>Operating system</th>
357+
<th>Vendor/version used</th>
358358
</tr>
359359
</thead>
360360
<tbody>
361361
<tr class="odd">
362-
<td style="text-align: left;">Linux</td>
363-
<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.6</td>
362+
<td>Linux</td>
363+
<td>Oracle Enterprise Linux 6.4 / 7.6</td>
364364
</tr>
365365
<tr class="even">
366-
<td style="text-align: left;">macOS</td>
367-
<td style="text-align: left;">Mac OS X 10.13 (High Sierra)</td>
366+
<td>macOS</td>
367+
<td>Mac OS X 10.13 (High Sierra)</td>
368368
</tr>
369369
<tr class="odd">
370-
<td style="text-align: left;">Windows</td>
371-
<td style="text-align: left;">Windows Server 2012 R2</td>
370+
<td>Windows</td>
371+
<td>Windows Server 2012 R2</td>
372372
</tr>
373373
</tbody>
374374
</table>
@@ -1195,27 +1195,27 @@ <h3 id="cross-compiling-the-easy-way-with-openjdk-devkits">Cross
11951195
<table>
11961196
<thead>
11971197
<tr class="header">
1198-
<th style="text-align: left;">Supported devkit targets</th>
1198+
<th>Supported devkit targets</th>
11991199
</tr>
12001200
</thead>
12011201
<tbody>
12021202
<tr class="odd">
1203-
<td style="text-align: left;">x86_64-linux-gnu</td>
1203+
<td>x86_64-linux-gnu</td>
12041204
</tr>
12051205
<tr class="even">
1206-
<td style="text-align: left;">aarch64-linux-gnu</td>
1206+
<td>aarch64-linux-gnu</td>
12071207
</tr>
12081208
<tr class="odd">
1209-
<td style="text-align: left;">arm-linux-gnueabihf</td>
1209+
<td>arm-linux-gnueabihf</td>
12101210
</tr>
12111211
<tr class="even">
1212-
<td style="text-align: left;">ppc64-linux-gnu</td>
1212+
<td>ppc64-linux-gnu</td>
12131213
</tr>
12141214
<tr class="odd">
1215-
<td style="text-align: left;">ppc64le-linux-gnu</td>
1215+
<td>ppc64le-linux-gnu</td>
12161216
</tr>
12171217
<tr class="even">
1218-
<td style="text-align: left;">s390x-linux-gnu</td>
1218+
<td>s390x-linux-gnu</td>
12191219
</tr>
12201220
</tbody>
12211221
</table>
@@ -1417,112 +1417,119 @@ <h3 id="cross-compiling-with-debian-sysroots">Cross compiling with
14171417
<p>Architectures that are known to successfully cross-compile like this
14181418
are:</p>
14191419
<table>
1420+
<colgroup>
1421+
<col style="width: 13%" />
1422+
<col style="width: 13%" />
1423+
<col style="width: 15%" />
1424+
<col style="width: 27%" />
1425+
<col style="width: 29%" />
1426+
</colgroup>
14201427
<thead>
14211428
<tr class="header">
1422-
<th style="text-align: left;">Target</th>
1423-
<th style="text-align: left;">Debian tree</th>
1424-
<th style="text-align: left;">Debian arch</th>
1425-
<th style="text-align: left;"><code>--openjdk-target=...</code></th>
1429+
<th>Target</th>
1430+
<th>Debian tree</th>
1431+
<th>Debian arch</th>
1432+
<th><code>--openjdk-target=...</code></th>
14261433
<th><code>--with-jvm-variants=...</code></th>
14271434
</tr>
14281435
</thead>
14291436
<tbody>
14301437
<tr class="odd">
1431-
<td style="text-align: left;">x86</td>
1432-
<td style="text-align: left;">buster</td>
1433-
<td style="text-align: left;">i386</td>
1434-
<td style="text-align: left;">i386-linux-gnu</td>
1438+
<td>x86</td>
1439+
<td>buster</td>
1440+
<td>i386</td>
1441+
<td>i386-linux-gnu</td>
14351442
<td>(all)</td>
14361443
</tr>
14371444
<tr class="even">
1438-
<td style="text-align: left;">arm</td>
1439-
<td style="text-align: left;">buster</td>
1440-
<td style="text-align: left;">armhf</td>
1441-
<td style="text-align: left;">arm-linux-gnueabihf</td>
1445+
<td>arm</td>
1446+
<td>buster</td>
1447+
<td>armhf</td>
1448+
<td>arm-linux-gnueabihf</td>
14421449
<td>(all)</td>
14431450
</tr>
14441451
<tr class="odd">
1445-
<td style="text-align: left;">aarch64</td>
1446-
<td style="text-align: left;">buster</td>
1447-
<td style="text-align: left;">arm64</td>
1448-
<td style="text-align: left;">aarch64-linux-gnu</td>
1452+
<td>aarch64</td>
1453+
<td>buster</td>
1454+
<td>arm64</td>
1455+
<td>aarch64-linux-gnu</td>
14491456
<td>(all)</td>
14501457
</tr>
14511458
<tr class="even">
1452-
<td style="text-align: left;">ppc64le</td>
1453-
<td style="text-align: left;">buster</td>
1454-
<td style="text-align: left;">ppc64el</td>
1455-
<td style="text-align: left;">powerpc64le-linux-gnu</td>
1459+
<td>ppc64le</td>
1460+
<td>buster</td>
1461+
<td>ppc64el</td>
1462+
<td>powerpc64le-linux-gnu</td>
14561463
<td>(all)</td>
14571464
</tr>
14581465
<tr class="odd">
1459-
<td style="text-align: left;">s390x</td>
1460-
<td style="text-align: left;">buster</td>
1461-
<td style="text-align: left;">s390x</td>
1462-
<td style="text-align: left;">s390x-linux-gnu</td>
1466+
<td>s390x</td>
1467+
<td>buster</td>
1468+
<td>s390x</td>
1469+
<td>s390x-linux-gnu</td>
14631470
<td>(all)</td>
14641471
</tr>
14651472
<tr class="even">
1466-
<td style="text-align: left;">mipsle</td>
1467-
<td style="text-align: left;">buster</td>
1468-
<td style="text-align: left;">mipsel</td>
1469-
<td style="text-align: left;">mipsel-linux-gnu</td>
1473+
<td>mipsle</td>
1474+
<td>buster</td>
1475+
<td>mipsel</td>
1476+
<td>mipsel-linux-gnu</td>
14701477
<td>zero</td>
14711478
</tr>
14721479
<tr class="odd">
1473-
<td style="text-align: left;">mips64le</td>
1474-
<td style="text-align: left;">buster</td>
1475-
<td style="text-align: left;">mips64el</td>
1476-
<td style="text-align: left;">mips64el-linux-gnueabi64</td>
1480+
<td>mips64le</td>
1481+
<td>buster</td>
1482+
<td>mips64el</td>
1483+
<td>mips64el-linux-gnueabi64</td>
14771484
<td>zero</td>
14781485
</tr>
14791486
<tr class="even">
1480-
<td style="text-align: left;">armel</td>
1481-
<td style="text-align: left;">buster</td>
1482-
<td style="text-align: left;">arm</td>
1483-
<td style="text-align: left;">arm-linux-gnueabi</td>
1487+
<td>armel</td>
1488+
<td>buster</td>
1489+
<td>arm</td>
1490+
<td>arm-linux-gnueabi</td>
14841491
<td>zero</td>
14851492
</tr>
14861493
<tr class="odd">
1487-
<td style="text-align: left;">ppc</td>
1488-
<td style="text-align: left;">sid</td>
1489-
<td style="text-align: left;">powerpc</td>
1490-
<td style="text-align: left;">powerpc-linux-gnu</td>
1494+
<td>ppc</td>
1495+
<td>sid</td>
1496+
<td>powerpc</td>
1497+
<td>powerpc-linux-gnu</td>
14911498
<td>zero</td>
14921499
</tr>
14931500
<tr class="even">
1494-
<td style="text-align: left;">ppc64be</td>
1495-
<td style="text-align: left;">sid</td>
1496-
<td style="text-align: left;">ppc64</td>
1497-
<td style="text-align: left;">powerpc64-linux-gnu</td>
1501+
<td>ppc64be</td>
1502+
<td>sid</td>
1503+
<td>ppc64</td>
1504+
<td>powerpc64-linux-gnu</td>
14981505
<td>(all)</td>
14991506
</tr>
15001507
<tr class="odd">
1501-
<td style="text-align: left;">m68k</td>
1502-
<td style="text-align: left;">sid</td>
1503-
<td style="text-align: left;">m68k</td>
1504-
<td style="text-align: left;">m68k-linux-gnu</td>
1508+
<td>m68k</td>
1509+
<td>sid</td>
1510+
<td>m68k</td>
1511+
<td>m68k-linux-gnu</td>
15051512
<td>zero</td>
15061513
</tr>
15071514
<tr class="even">
1508-
<td style="text-align: left;">alpha</td>
1509-
<td style="text-align: left;">sid</td>
1510-
<td style="text-align: left;">alpha</td>
1511-
<td style="text-align: left;">alpha-linux-gnu</td>
1515+
<td>alpha</td>
1516+
<td>sid</td>
1517+
<td>alpha</td>
1518+
<td>alpha-linux-gnu</td>
15121519
<td>zero</td>
15131520
</tr>
15141521
<tr class="odd">
1515-
<td style="text-align: left;">sh4</td>
1516-
<td style="text-align: left;">sid</td>
1517-
<td style="text-align: left;">sh4</td>
1518-
<td style="text-align: left;">sh4-linux-gnu</td>
1522+
<td>sh4</td>
1523+
<td>sid</td>
1524+
<td>sh4</td>
1525+
<td>sh4-linux-gnu</td>
15191526
<td>zero</td>
15201527
</tr>
15211528
<tr class="even">
1522-
<td style="text-align: left;">riscv64</td>
1523-
<td style="text-align: left;">sid</td>
1524-
<td style="text-align: left;">riscv64</td>
1525-
<td style="text-align: left;">riscv64-linux-gnu</td>
1529+
<td>riscv64</td>
1530+
<td>sid</td>
1531+
<td>riscv64</td>
1532+
<td>riscv64-linux-gnu</td>
15261533
<td>(all)</td>
15271534
</tr>
15281535
</tbody>

‎doc/building.md‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ This table lists the OS versions used by Oracle when building the JDK. Such
162162
information is always subject to change, but this table is up to date at the
163163
time of writing.
164164

165-
Operating system Vendor/version used
166-
----------------- -------------------------------------------------------
167-
Linux Oracle Enterprise Linux 6.4 / 7.6
168-
macOS Mac OS X 10.13 (High Sierra)
169-
Windows Windows Server 2012 R2
165+
| Operating system | Vendor/version used |
166+
| ----------------- | ---------------------------------- |
167+
| Linux | Oracle Enterprise Linux 6.4 / 7.6 |
168+
| macOS | Mac OS X 10.13 (High Sierra) |
169+
| Windows | Windows Server 2012 R2 |
170170

171171
The double version numbers for Linux are due to the hybrid model
172172
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
970970
targets are given, a native toolchain for the current platform will be
971971
created. Currently, at least the following targets are known to work:
972972
973-
Supported devkit targets
974-
-------------------------
975-
x86_64-linux-gnu
976-
aarch64-linux-gnu
977-
arm-linux-gnueabihf
978-
ppc64-linux-gnu
979-
ppc64le-linux-gnu
980-
s390x-linux-gnu
973+
| Supported devkit targets |
974+
| ------------------------ |
975+
| x86_64-linux-gnu |
976+
| aarch64-linux-gnu |
977+
| arm-linux-gnueabihf |
978+
| ppc64-linux-gnu |
979+
| ppc64le-linux-gnu |
980+
| s390x-linux-gnu |
981981
982982
`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
983983
"Fedora" (if not specified "OEL6" will be the default). If the base OS
@@ -1204,22 +1204,22 @@ it might require a little nudge with:
12041204
12051205
Architectures that are known to successfully cross-compile like this are:
12061206
1207-
Target Debian tree Debian arch `--openjdk-target=...` `--with-jvm-variants=...`
1208-
------------ ------------ ------------- ------------------------ --------------
1209-
x86 buster i386 i386-linux-gnu (all)
1210-
arm buster armhf arm-linux-gnueabihf (all)
1211-
aarch64 buster arm64 aarch64-linux-gnu (all)
1212-
ppc64le buster ppc64el powerpc64le-linux-gnu (all)
1213-
s390x buster s390x s390x-linux-gnu (all)
1214-
mipsle buster mipsel mipsel-linux-gnu zero
1215-
mips64le buster mips64el mips64el-linux-gnueabi64 zero
1216-
armel buster arm arm-linux-gnueabi zero
1217-
ppc sid powerpc powerpc-linux-gnu zero
1218-
ppc64be sid ppc64 powerpc64-linux-gnu (all)
1219-
m68k sid m68k m68k-linux-gnu zero
1220-
alpha sid alpha alpha-linux-gnu zero
1221-
sh4 sid sh4 sh4-linux-gnu zero
1222-
riscv64 sid riscv64 riscv64-linux-gnu (all)
1207+
| Target | Debian tree | Debian arch | `--openjdk-target=...` | `--with-jvm-variants=...` |
1208+
| ------------ | ------------ | ------------- | ------------------------ | ------------------------- |
1209+
| x86 | buster | i386 | i386-linux-gnu | (all) |
1210+
| arm | buster | armhf | arm-linux-gnueabihf | (all) |
1211+
| aarch64 | buster | arm64 | aarch64-linux-gnu | (all) |
1212+
| ppc64le | buster | ppc64el | powerpc64le-linux-gnu | (all) |
1213+
| s390x | buster | s390x | s390x-linux-gnu | (all) |
1214+
| mipsle | buster | mipsel | mipsel-linux-gnu | zero |
1215+
| mips64le | buster | mips64el | mips64el-linux-gnueabi64 | zero |
1216+
| armel | buster | arm | arm-linux-gnueabi | zero |
1217+
| ppc | sid | powerpc | powerpc-linux-gnu | zero |
1218+
| ppc64be | sid | ppc64 | powerpc64-linux-gnu | (all) |
1219+
| m68k | sid | m68k | m68k-linux-gnu | zero |
1220+
| alpha | sid | alpha | alpha-linux-gnu | zero |
1221+
| sh4 | sid | sh4 | sh4-linux-gnu | zero |
1222+
| riscv64 | sid | riscv64 | riscv64-linux-gnu | (all) |
12231223
12241224
### Building for ARM/aarch64
12251225

0 commit comments

Comments
 (0)