Skip to content

Commit ef598eb

Browse files
zzambersgnu-andrew
zzambers
authored and
gnu-andrew
committed
8306408: Fix the format of several tables in building.md
Reviewed-by: andrew Backport-of: 26755a968665545a151adce79a5227c79724bb6b
1 parent 3285292 commit ef598eb

File tree

2 files changed

+99
-99
lines changed

2 files changed

+99
-99
lines changed

‎doc/building.html‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,22 @@ <h2 id="operating-system-requirements">Operating System Requirements</h2>
174174
<table>
175175
<thead>
176176
<tr class="header">
177-
<th style="text-align: left;">Operating system</th>
178-
<th style="text-align: left;">Vendor/version used</th>
177+
<th>Operating system</th>
178+
<th>Vendor/version used</th>
179179
</tr>
180180
</thead>
181181
<tbody>
182182
<tr class="odd">
183-
<td style="text-align: left;">Linux</td>
184-
<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.6</td>
183+
<td>Linux</td>
184+
<td>Oracle Enterprise Linux 6.4 / 7.6</td>
185185
</tr>
186186
<tr class="even">
187-
<td style="text-align: left;">macOS</td>
188-
<td style="text-align: left;">Mac OS X 10.13 (High Sierra)</td>
187+
<td>macOS</td>
188+
<td>Mac OS X 10.13 (High Sierra)</td>
189189
</tr>
190190
<tr class="odd">
191-
<td style="text-align: left;">Windows</td>
192-
<td style="text-align: left;">Windows Server 2012 R2</td>
191+
<td>Windows</td>
192+
<td>Windows Server 2012 R2</td>
193193
</tr>
194194
</tbody>
195195
</table>
@@ -544,27 +544,27 @@ <h3 id="cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the e
544544
<table>
545545
<thead>
546546
<tr class="header">
547-
<th style="text-align: left;">Supported devkit targets</th>
547+
<th>Supported devkit targets</th>
548548
</tr>
549549
</thead>
550550
<tbody>
551551
<tr class="odd">
552-
<td style="text-align: left;">x86_64-linux-gnu</td>
552+
<td>x86_64-linux-gnu</td>
553553
</tr>
554554
<tr class="even">
555-
<td style="text-align: left;">aarch64-linux-gnu</td>
555+
<td>aarch64-linux-gnu</td>
556556
</tr>
557557
<tr class="odd">
558-
<td style="text-align: left;">arm-linux-gnueabihf</td>
558+
<td>arm-linux-gnueabihf</td>
559559
</tr>
560560
<tr class="even">
561-
<td style="text-align: left;">ppc64-linux-gnu</td>
561+
<td>ppc64-linux-gnu</td>
562562
</tr>
563563
<tr class="odd">
564-
<td style="text-align: left;">ppc64le-linux-gnu</td>
564+
<td>ppc64le-linux-gnu</td>
565565
</tr>
566566
<tr class="even">
567-
<td style="text-align: left;">s390x-linux-gnu</td>
567+
<td>s390x-linux-gnu</td>
568568
</tr>
569569
</tbody>
570570
</table>
@@ -678,103 +678,103 @@ <h3 id="cross-compiling-with-debian-sysroots">Cross compiling with Debian sysroo
678678
<table>
679679
<thead>
680680
<tr class="header">
681-
<th style="text-align: left;">Target</th>
682-
<th style="text-align: left;">Debian tree</th>
683-
<th style="text-align: left;">Debian arch</th>
684-
<th style="text-align: left;"><code>--openjdk-target=...</code></th>
681+
<th>Target</th>
682+
<th>Debian tree</th>
683+
<th>Debian arch</th>
684+
<th><code>--openjdk-target=...</code></th>
685685
<th><code>--with-jvm-variants=...</code></th>
686686
</tr>
687687
</thead>
688688
<tbody>
689689
<tr class="odd">
690-
<td style="text-align: left;">x86</td>
691-
<td style="text-align: left;">buster</td>
692-
<td style="text-align: left;">i386</td>
693-
<td style="text-align: left;">i386-linux-gnu</td>
690+
<td>x86</td>
691+
<td>buster</td>
692+
<td>i386</td>
693+
<td>i386-linux-gnu</td>
694694
<td>(all)</td>
695695
</tr>
696696
<tr class="even">
697-
<td style="text-align: left;">arm</td>
698-
<td style="text-align: left;">buster</td>
699-
<td style="text-align: left;">armhf</td>
700-
<td style="text-align: left;">arm-linux-gnueabihf</td>
697+
<td>arm</td>
698+
<td>buster</td>
699+
<td>armhf</td>
700+
<td>arm-linux-gnueabihf</td>
701701
<td>(all)</td>
702702
</tr>
703703
<tr class="odd">
704-
<td style="text-align: left;">aarch64</td>
705-
<td style="text-align: left;">buster</td>
706-
<td style="text-align: left;">arm64</td>
707-
<td style="text-align: left;">aarch64-linux-gnu</td>
704+
<td>aarch64</td>
705+
<td>buster</td>
706+
<td>arm64</td>
707+
<td>aarch64-linux-gnu</td>
708708
<td>(all)</td>
709709
</tr>
710710
<tr class="even">
711-
<td style="text-align: left;">ppc64le</td>
712-
<td style="text-align: left;">buster</td>
713-
<td style="text-align: left;">ppc64el</td>
714-
<td style="text-align: left;">powerpc64le-linux-gnu</td>
711+
<td>ppc64le</td>
712+
<td>buster</td>
713+
<td>ppc64el</td>
714+
<td>powerpc64le-linux-gnu</td>
715715
<td>(all)</td>
716716
</tr>
717717
<tr class="odd">
718-
<td style="text-align: left;">s390x</td>
719-
<td style="text-align: left;">buster</td>
720-
<td style="text-align: left;">s390x</td>
721-
<td style="text-align: left;">s390x-linux-gnu</td>
718+
<td>s390x</td>
719+
<td>buster</td>
720+
<td>s390x</td>
721+
<td>s390x-linux-gnu</td>
722722
<td>(all)</td>
723723
</tr>
724724
<tr class="even">
725-
<td style="text-align: left;">mipsle</td>
726-
<td style="text-align: left;">buster</td>
727-
<td style="text-align: left;">mipsel</td>
728-
<td style="text-align: left;">mipsel-linux-gnu</td>
725+
<td>mipsle</td>
726+
<td>buster</td>
727+
<td>mipsel</td>
728+
<td>mipsel-linux-gnu</td>
729729
<td>zero</td>
730730
</tr>
731731
<tr class="odd">
732-
<td style="text-align: left;">mips64le</td>
733-
<td style="text-align: left;">buster</td>
734-
<td style="text-align: left;">mips64el</td>
735-
<td style="text-align: left;">mips64el-linux-gnueabi64</td>
732+
<td>mips64le</td>
733+
<td>buster</td>
734+
<td>mips64el</td>
735+
<td>mips64el-linux-gnueabi64</td>
736736
<td>zero</td>
737737
</tr>
738738
<tr class="even">
739-
<td style="text-align: left;">armel</td>
740-
<td style="text-align: left;">buster</td>
741-
<td style="text-align: left;">arm</td>
742-
<td style="text-align: left;">arm-linux-gnueabi</td>
739+
<td>armel</td>
740+
<td>buster</td>
741+
<td>arm</td>
742+
<td>arm-linux-gnueabi</td>
743743
<td>zero</td>
744744
</tr>
745745
<tr class="odd">
746-
<td style="text-align: left;">ppc</td>
747-
<td style="text-align: left;">sid</td>
748-
<td style="text-align: left;">powerpc</td>
749-
<td style="text-align: left;">powerpc-linux-gnu</td>
746+
<td>ppc</td>
747+
<td>sid</td>
748+
<td>powerpc</td>
749+
<td>powerpc-linux-gnu</td>
750750
<td>zero</td>
751751
</tr>
752752
<tr class="even">
753-
<td style="text-align: left;">ppc64be</td>
754-
<td style="text-align: left;">sid</td>
755-
<td style="text-align: left;">ppc64</td>
756-
<td style="text-align: left;">powerpc64-linux-gnu</td>
753+
<td>ppc64be</td>
754+
<td>sid</td>
755+
<td>ppc64</td>
756+
<td>powerpc64-linux-gnu</td>
757757
<td>(all)</td>
758758
</tr>
759759
<tr class="odd">
760-
<td style="text-align: left;">m68k</td>
761-
<td style="text-align: left;">sid</td>
762-
<td style="text-align: left;">m68k</td>
763-
<td style="text-align: left;">m68k-linux-gnu</td>
760+
<td>m68k</td>
761+
<td>sid</td>
762+
<td>m68k</td>
763+
<td>m68k-linux-gnu</td>
764764
<td>zero</td>
765765
</tr>
766766
<tr class="even">
767-
<td style="text-align: left;">alpha</td>
768-
<td style="text-align: left;">sid</td>
769-
<td style="text-align: left;">alpha</td>
770-
<td style="text-align: left;">alpha-linux-gnu</td>
767+
<td>alpha</td>
768+
<td>sid</td>
769+
<td>alpha</td>
770+
<td>alpha-linux-gnu</td>
771771
<td>zero</td>
772772
</tr>
773773
<tr class="odd">
774-
<td style="text-align: left;">sh4</td>
775-
<td style="text-align: left;">sid</td>
776-
<td style="text-align: left;">sh4</td>
777-
<td style="text-align: left;">sh4-linux-gnu</td>
774+
<td>sh4</td>
775+
<td>sid</td>
776+
<td>sh4</td>
777+
<td>sh4-linux-gnu</td>
778778
<td>zero</td>
779779
</tr>
780780
</tbody>

‎doc/building.md‎

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

157-
Operating system Vendor/version used
158-
----------------- -------------------------------------------------------
159-
Linux Oracle Enterprise Linux 6.4 / 7.6
160-
macOS Mac OS X 10.13 (High Sierra)
161-
Windows Windows Server 2012 R2
157+
| Operating system | Vendor/version used |
158+
| ----------------- | ---------------------------------- |
159+
| Linux | Oracle Enterprise Linux 6.4 / 7.6 |
160+
| macOS | Mac OS X 10.13 (High Sierra) |
161+
| Windows | Windows Server 2012 R2 |
162162

163163
The double version numbers for Linux are due to the hybrid model
164164
used at Oracle, where header files and external libraries from an older version
@@ -957,14 +957,14 @@ https://sourceware.org/autobook/autobook/autobook_17.html). If no
957957
targets are given, a native toolchain for the current platform will be
958958
created. Currently, at least the following targets are known to work:
959959
960-
Supported devkit targets
961-
-------------------------
962-
x86_64-linux-gnu
963-
aarch64-linux-gnu
964-
arm-linux-gnueabihf
965-
ppc64-linux-gnu
966-
ppc64le-linux-gnu
967-
s390x-linux-gnu
960+
| Supported devkit targets |
961+
| ------------------------ |
962+
| x86_64-linux-gnu |
963+
| aarch64-linux-gnu |
964+
| arm-linux-gnueabihf |
965+
| ppc64-linux-gnu |
966+
| ppc64le-linux-gnu |
967+
| s390x-linux-gnu |
968968
969969
`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
970970
"Fedora" (if not specified "OEL6" will be the default). If the base OS
@@ -1184,21 +1184,21 @@ it might require a little nudge with:
11841184
11851185
Architectures that are known to successfully cross-compile like this are:
11861186
1187-
Target Debian tree Debian arch `--openjdk-target=...` `--with-jvm-variants=...`
1188-
------------ ------------ ------------- ------------------------ --------------
1189-
x86 buster i386 i386-linux-gnu (all)
1190-
arm buster armhf arm-linux-gnueabihf (all)
1191-
aarch64 buster arm64 aarch64-linux-gnu (all)
1192-
ppc64le buster ppc64el powerpc64le-linux-gnu (all)
1193-
s390x buster s390x s390x-linux-gnu (all)
1194-
mipsle buster mipsel mipsel-linux-gnu zero
1195-
mips64le buster mips64el mips64el-linux-gnueabi64 zero
1196-
armel buster arm arm-linux-gnueabi zero
1197-
ppc sid powerpc powerpc-linux-gnu zero
1198-
ppc64be sid ppc64 powerpc64-linux-gnu (all)
1199-
m68k sid m68k m68k-linux-gnu zero
1200-
alpha sid alpha alpha-linux-gnu zero
1201-
sh4 sid sh4 sh4-linux-gnu zero
1187+
| Target | Debian tree | Debian arch | `--openjdk-target=...` | `--with-jvm-variants=...` |
1188+
| ------------ | ------------ | ------------- | ------------------------ | ------------------------- |
1189+
| x86 | buster | i386 | i386-linux-gnu | (all) |
1190+
| arm | buster | armhf | arm-linux-gnueabihf | (all) |
1191+
| aarch64 | buster | arm64 | aarch64-linux-gnu | (all) |
1192+
| ppc64le | buster | ppc64el | powerpc64le-linux-gnu | (all) |
1193+
| s390x | buster | s390x | s390x-linux-gnu | (all) |
1194+
| mipsle | buster | mipsel | mipsel-linux-gnu | zero |
1195+
| mips64le | buster | mips64el | mips64el-linux-gnueabi64 | zero |
1196+
| armel | buster | arm | arm-linux-gnueabi | zero |
1197+
| ppc | sid | powerpc | powerpc-linux-gnu | zero |
1198+
| ppc64be | sid | ppc64 | powerpc64-linux-gnu | (all) |
1199+
| m68k | sid | m68k | m68k-linux-gnu | zero |
1200+
| alpha | sid | alpha | alpha-linux-gnu | zero |
1201+
| sh4 | sid | sh4 | sh4-linux-gnu | zero |
12021202
12031203
### Building for ARM/aarch64
12041204

0 commit comments

Comments
 (0)