Skip to content

Commit 659a466

Browse files
zzambersjerboaa
zzambers
authored and
jerboaa
committed
8306408: Fix the format of several tables in building.md
Reviewed-by: andrew Backport-of: 26755a968665545a151adce79a5227c79724bb6b
1 parent 86dddbc commit 659a466

File tree

2 files changed

+129
-130
lines changed

2 files changed

+129
-130
lines changed

‎doc/building.html‎

Lines changed: 88 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -175,26 +175,26 @@ <h2 id="operating-system-requirements">Operating System Requirements</h2>
175175
<table>
176176
<thead>
177177
<tr class="header">
178-
<th style="text-align: left;">Operating system</th>
179-
<th style="text-align: left;">Vendor/version used</th>
178+
<th>Operating system</th>
179+
<th>Vendor/version used</th>
180180
</tr>
181181
</thead>
182182
<tbody>
183183
<tr class="odd">
184-
<td style="text-align: left;">Linux</td>
185-
<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13)</td>
184+
<td>Linux</td>
185+
<td>Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13)</td>
186186
</tr>
187187
<tr class="even">
188-
<td style="text-align: left;">Solaris</td>
189-
<td style="text-align: left;">Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5</td>
188+
<td>Solaris</td>
189+
<td>Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5</td>
190190
</tr>
191191
<tr class="odd">
192-
<td style="text-align: left;">macOS</td>
193-
<td style="text-align: left;">Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite)</td>
192+
<td>macOS</td>
193+
<td>Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite)</td>
194194
</tr>
195195
<tr class="even">
196-
<td style="text-align: left;">Windows</td>
197-
<td style="text-align: left;">Windows Server 2012 R2</td>
196+
<td>Windows</td>
197+
<td>Windows Server 2012 R2</td>
198198
</tr>
199199
</tbody>
200200
</table>
@@ -296,7 +296,6 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requ
296296
</tr>
297297
</tbody>
298298
</table>
299-
<p>All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.</p>
300299
<h3 id="gcc">gcc</h3>
301300
<p>The minimum accepted version of gcc is 4.8. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
302301
<p>The JDK is currently known to be able to compile with at least version 7.4 of gcc.</p>
@@ -320,50 +319,50 @@ <h3 id="oracle-solaris-studio">Oracle Solaris Studio</h3>
320319
<table>
321320
<thead>
322321
<tr class="header">
323-
<th style="text-align: left;">Package</th>
324-
<th style="text-align: left;">Version</th>
322+
<th>Package</th>
323+
<th>Version</th>
325324
</tr>
326325
</thead>
327326
<tbody>
328327
<tr class="odd">
329-
<td style="text-align: left;">developer/solarisstudio-124/backend</td>
330-
<td style="text-align: left;">12.4-1.0.6.0</td>
328+
<td>developer/solarisstudio-124/backend</td>
329+
<td>12.4-1.0.6.0</td>
331330
</tr>
332331
<tr class="even">
333-
<td style="text-align: left;">developer/solarisstudio-124/c++</td>
334-
<td style="text-align: left;">12.4-1.0.10.0</td>
332+
<td>developer/solarisstudio-124/c++</td>
333+
<td>12.4-1.0.10.0</td>
335334
</tr>
336335
<tr class="odd">
337-
<td style="text-align: left;">developer/solarisstudio-124/cc</td>
338-
<td style="text-align: left;">12.4-1.0.4.0</td>
336+
<td>developer/solarisstudio-124/cc</td>
337+
<td>12.4-1.0.4.0</td>
339338
</tr>
340339
<tr class="even">
341-
<td style="text-align: left;">developer/solarisstudio-124/library/c++-libs</td>
342-
<td style="text-align: left;">12.4-1.0.10.0</td>
340+
<td>developer/solarisstudio-124/library/c++-libs</td>
341+
<td>12.4-1.0.10.0</td>
343342
</tr>
344343
<tr class="odd">
345-
<td style="text-align: left;">developer/solarisstudio-124/library/math-libs</td>
346-
<td style="text-align: left;">12.4-1.0.0.1</td>
344+
<td>developer/solarisstudio-124/library/math-libs</td>
345+
<td>12.4-1.0.0.1</td>
347346
</tr>
348347
<tr class="even">
349-
<td style="text-align: left;">developer/solarisstudio-124/library/studio-gccrt</td>
350-
<td style="text-align: left;">12.4-1.0.0.1</td>
348+
<td>developer/solarisstudio-124/library/studio-gccrt</td>
349+
<td>12.4-1.0.0.1</td>
351350
</tr>
352351
<tr class="odd">
353-
<td style="text-align: left;">developer/solarisstudio-124/studio-common</td>
354-
<td style="text-align: left;">12.4-1.0.0.1</td>
352+
<td>developer/solarisstudio-124/studio-common</td>
353+
<td>12.4-1.0.0.1</td>
355354
</tr>
356355
<tr class="even">
357-
<td style="text-align: left;">developer/solarisstudio-124/studio-ja</td>
358-
<td style="text-align: left;">12.4-1.0.0.1</td>
356+
<td>developer/solarisstudio-124/studio-ja</td>
357+
<td>12.4-1.0.0.1</td>
359358
</tr>
360359
<tr class="odd">
361-
<td style="text-align: left;">developer/solarisstudio-124/studio-legal</td>
362-
<td style="text-align: left;">12.4-1.0.0.1</td>
360+
<td>developer/solarisstudio-124/studio-legal</td>
361+
<td>12.4-1.0.0.1</td>
363362
</tr>
364363
<tr class="even">
365-
<td style="text-align: left;">developer/solarisstudio-124/studio-zhCN</td>
366-
<td style="text-align: left;">12.4-1.0.0.1</td>
364+
<td>developer/solarisstudio-124/studio-zhCN</td>
365+
<td>12.4-1.0.0.1</td>
367366
</tr>
368367
</tbody>
369368
</table>
@@ -747,103 +746,103 @@ <h3 id="cross-compiling-with-debian-sysroots">Cross compiling with Debian sysroo
747746
<table>
748747
<thead>
749748
<tr class="header">
750-
<th style="text-align: left;">Target</th>
751-
<th style="text-align: left;">Debian tree</th>
752-
<th style="text-align: left;">Debian arch</th>
753-
<th style="text-align: left;"><code>--openjdk-target=...</code></th>
749+
<th>Target</th>
750+
<th>Debian tree</th>
751+
<th>Debian arch</th>
752+
<th><code>--openjdk-target=...</code></th>
754753
<th><code>--with-jvm-variants=...</code></th>
755754
</tr>
756755
</thead>
757756
<tbody>
758757
<tr class="odd">
759-
<td style="text-align: left;">x86</td>
760-
<td style="text-align: left;">buster</td>
761-
<td style="text-align: left;">i386</td>
762-
<td style="text-align: left;">i386-linux-gnu</td>
758+
<td>x86</td>
759+
<td>buster</td>
760+
<td>i386</td>
761+
<td>i386-linux-gnu</td>
763762
<td>(all)</td>
764763
</tr>
765764
<tr class="even">
766-
<td style="text-align: left;">arm</td>
767-
<td style="text-align: left;">buster</td>
768-
<td style="text-align: left;">armhf</td>
769-
<td style="text-align: left;">arm-linux-gnueabihf</td>
765+
<td>arm</td>
766+
<td>buster</td>
767+
<td>armhf</td>
768+
<td>arm-linux-gnueabihf</td>
770769
<td>(all)</td>
771770
</tr>
772771
<tr class="odd">
773-
<td style="text-align: left;">aarch64</td>
774-
<td style="text-align: left;">buster</td>
775-
<td style="text-align: left;">arm64</td>
776-
<td style="text-align: left;">aarch64-linux-gnu</td>
772+
<td>aarch64</td>
773+
<td>buster</td>
774+
<td>arm64</td>
775+
<td>aarch64-linux-gnu</td>
777776
<td>(all)</td>
778777
</tr>
779778
<tr class="even">
780-
<td style="text-align: left;">ppc64le</td>
781-
<td style="text-align: left;">buster</td>
782-
<td style="text-align: left;">ppc64el</td>
783-
<td style="text-align: left;">powerpc64le-linux-gnu</td>
779+
<td>ppc64le</td>
780+
<td>buster</td>
781+
<td>ppc64el</td>
782+
<td>powerpc64le-linux-gnu</td>
784783
<td>(all)</td>
785784
</tr>
786785
<tr class="odd">
787-
<td style="text-align: left;">s390x</td>
788-
<td style="text-align: left;">buster</td>
789-
<td style="text-align: left;">s390x</td>
790-
<td style="text-align: left;">s390x-linux-gnu</td>
786+
<td>s390x</td>
787+
<td>buster</td>
788+
<td>s390x</td>
789+
<td>s390x-linux-gnu</td>
791790
<td>(all)</td>
792791
</tr>
793792
<tr class="even">
794-
<td style="text-align: left;">mipsle</td>
795-
<td style="text-align: left;">buster</td>
796-
<td style="text-align: left;">mipsel</td>
797-
<td style="text-align: left;">mipsel-linux-gnu</td>
793+
<td>mipsle</td>
794+
<td>buster</td>
795+
<td>mipsel</td>
796+
<td>mipsel-linux-gnu</td>
798797
<td>zero</td>
799798
</tr>
800799
<tr class="odd">
801-
<td style="text-align: left;">mips64le</td>
802-
<td style="text-align: left;">buster</td>
803-
<td style="text-align: left;">mips64el</td>
804-
<td style="text-align: left;">mips64el-linux-gnueabi64</td>
800+
<td>mips64le</td>
801+
<td>buster</td>
802+
<td>mips64el</td>
803+
<td>mips64el-linux-gnueabi64</td>
805804
<td>zero</td>
806805
</tr>
807806
<tr class="even">
808-
<td style="text-align: left;">armel</td>
809-
<td style="text-align: left;">buster</td>
810-
<td style="text-align: left;">arm</td>
811-
<td style="text-align: left;">arm-linux-gnueabi</td>
807+
<td>armel</td>
808+
<td>buster</td>
809+
<td>arm</td>
810+
<td>arm-linux-gnueabi</td>
812811
<td>zero</td>
813812
</tr>
814813
<tr class="odd">
815-
<td style="text-align: left;">ppc</td>
816-
<td style="text-align: left;">sid</td>
817-
<td style="text-align: left;">powerpc</td>
818-
<td style="text-align: left;">powerpc-linux-gnu</td>
814+
<td>ppc</td>
815+
<td>sid</td>
816+
<td>powerpc</td>
817+
<td>powerpc-linux-gnu</td>
819818
<td>zero</td>
820819
</tr>
821820
<tr class="even">
822-
<td style="text-align: left;">ppc64be</td>
823-
<td style="text-align: left;">sid</td>
824-
<td style="text-align: left;">ppc64</td>
825-
<td style="text-align: left;">powerpc64-linux-gnu</td>
821+
<td>ppc64be</td>
822+
<td>sid</td>
823+
<td>ppc64</td>
824+
<td>powerpc64-linux-gnu</td>
826825
<td>(all)</td>
827826
</tr>
828827
<tr class="odd">
829-
<td style="text-align: left;">m68k</td>
830-
<td style="text-align: left;">sid</td>
831-
<td style="text-align: left;">m68k</td>
832-
<td style="text-align: left;">m68k-linux-gnu</td>
828+
<td>m68k</td>
829+
<td>sid</td>
830+
<td>m68k</td>
831+
<td>m68k-linux-gnu</td>
833832
<td>zero</td>
834833
</tr>
835834
<tr class="even">
836-
<td style="text-align: left;">alpha</td>
837-
<td style="text-align: left;">sid</td>
838-
<td style="text-align: left;">alpha</td>
839-
<td style="text-align: left;">alpha-linux-gnu</td>
835+
<td>alpha</td>
836+
<td>sid</td>
837+
<td>alpha</td>
838+
<td>alpha-linux-gnu</td>
840839
<td>zero</td>
841840
</tr>
842841
<tr class="odd">
843-
<td style="text-align: left;">sh4</td>
844-
<td style="text-align: left;">sid</td>
845-
<td style="text-align: left;">sh4</td>
846-
<td style="text-align: left;">sh4-linux-gnu</td>
842+
<td>sh4</td>
843+
<td>sid</td>
844+
<td>sh4</td>
845+
<td>sh4-linux-gnu</td>
847846
<td>zero</td>
848847
</tr>
849848
</tbody>

‎doc/building.md‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ This table lists the OS versions used by Oracle when building the JDK. Such
151151
information is always subject to change, but this table is up to date at the
152152
time of writing.
153153

154-
Operating system Vendor/version used
155-
----------------- -------------------------------------------------------
156-
Linux Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13)
157-
Solaris Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5
158-
macOS Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite)
159-
Windows Windows Server 2012 R2
154+
| Operating system | Vendor/version used |
155+
| ----------------- | ------------------------------------------------------- |
156+
| Linux | Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13) |
157+
| Solaris | Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5 |
158+
| macOS | Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite) |
159+
| Windows | Windows Server 2012 R2 |
160160

161161
The double version numbers for Linux, Solaris and macOS is due to the hybrid
162162
model used at Oracle, where header files and external libraries from an older
@@ -363,18 +363,18 @@ configure.
363363

364364
The Solaris Studio installation should contain at least these packages:
365365

366-
Package Version
367-
-------------------------------------------------- -------------
368-
developer/solarisstudio-124/backend 12.4-1.0.6.0
369-
developer/solarisstudio-124/c++ 12.4-1.0.10.0
370-
developer/solarisstudio-124/cc 12.4-1.0.4.0
371-
developer/solarisstudio-124/library/c++-libs 12.4-1.0.10.0
372-
developer/solarisstudio-124/library/math-libs 12.4-1.0.0.1
373-
developer/solarisstudio-124/library/studio-gccrt 12.4-1.0.0.1
374-
developer/solarisstudio-124/studio-common 12.4-1.0.0.1
375-
developer/solarisstudio-124/studio-ja 12.4-1.0.0.1
376-
developer/solarisstudio-124/studio-legal 12.4-1.0.0.1
377-
developer/solarisstudio-124/studio-zhCN 12.4-1.0.0.1
366+
| Package | Version |
367+
| -------------------------------------------------- | ------------- |
368+
| developer/solarisstudio-124/backend | 12.4-1.0.6.0 |
369+
| developer/solarisstudio-124/c++ | 12.4-1.0.10.0 |
370+
| developer/solarisstudio-124/cc | 12.4-1.0.4.0 |
371+
| developer/solarisstudio-124/library/c++-libs | 12.4-1.0.10.0 |
372+
| developer/solarisstudio-124/library/math-libs | 12.4-1.0.0.1 |
373+
| developer/solarisstudio-124/library/studio-gccrt | 12.4-1.0.0.1 |
374+
| developer/solarisstudio-124/studio-common | 12.4-1.0.0.1 |
375+
| developer/solarisstudio-124/studio-ja | 12.4-1.0.0.1 |
376+
| developer/solarisstudio-124/studio-legal | 12.4-1.0.0.1 |
377+
| developer/solarisstudio-124/studio-zhCN | 12.4-1.0.0.1 |
378378

379379
Compiling with Solaris Studio can sometimes be finicky. This is the exact
380380
version used by Oracle, which worked correctly at the time of writing:
@@ -965,14 +965,14 @@ https://sourceware.org/autobook/autobook/autobook_17.html). If no
965965
targets are given, a native toolchain for the current platform will be
966966
created. Currently, at least the following targets are known to work:
967967
968-
Supported devkit targets
969-
------------------------
970-
x86_64-linux-gnu
971-
aarch64-linux-gnu
972-
arm-linux-gnueabihf
973-
ppc64-linux-gnu
974-
ppc64le-linux-gnu
975-
s390x-linux-gnu
968+
| Supported devkit targets |
969+
| ------------------------ |
970+
| x86_64-linux-gnu |
971+
| aarch64-linux-gnu |
972+
| arm-linux-gnueabihf |
973+
| ppc64-linux-gnu |
974+
| ppc64le-linux-gnu |
975+
| s390x-linux-gnu |
976976
977977
`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
978978
"Fedora" (if not specified "OEL6" will be the default). If the base OS
@@ -1199,21 +1199,21 @@ it might require a little nudge with:
11991199
12001200
Architectures that are known to successfully cross-compile like this are:
12011201
1202-
Target Debian tree Debian arch `--openjdk-target=...` `--with-jvm-variants=...`
1203-
------------ ------------ ------------- ------------------------ --------------
1204-
x86 buster i386 i386-linux-gnu (all)
1205-
arm buster armhf arm-linux-gnueabihf (all)
1206-
aarch64 buster arm64 aarch64-linux-gnu (all)
1207-
ppc64le buster ppc64el powerpc64le-linux-gnu (all)
1208-
s390x buster s390x s390x-linux-gnu (all)
1209-
mipsle buster mipsel mipsel-linux-gnu zero
1210-
mips64le buster mips64el mips64el-linux-gnueabi64 zero
1211-
armel buster arm arm-linux-gnueabi zero
1212-
ppc sid powerpc powerpc-linux-gnu zero
1213-
ppc64be sid ppc64 powerpc64-linux-gnu (all)
1214-
m68k sid m68k m68k-linux-gnu zero
1215-
alpha sid alpha alpha-linux-gnu zero
1216-
sh4 sid sh4 sh4-linux-gnu zero
1202+
| Target | Debian tree | Debian arch | `--openjdk-target=...` | `--with-jvm-variants=...` |
1203+
| ------------ | ------------ | ------------- | ------------------------ | ------------------------- |
1204+
| x86 | buster | i386 | i386-linux-gnu | (all) |
1205+
| arm | buster | armhf | arm-linux-gnueabihf | (all) |
1206+
| aarch64 | buster | arm64 | aarch64-linux-gnu | (all) |
1207+
| ppc64le | buster | ppc64el | powerpc64le-linux-gnu | (all) |
1208+
| s390x | buster | s390x | s390x-linux-gnu | (all) |
1209+
| mipsle | buster | mipsel | mipsel-linux-gnu | zero |
1210+
| mips64le | buster | mips64el | mips64el-linux-gnueabi64 | zero |
1211+
| armel | buster | arm | arm-linux-gnueabi | zero |
1212+
| ppc | sid | powerpc | powerpc-linux-gnu | zero |
1213+
| ppc64be | sid | ppc64 | powerpc64-linux-gnu | (all) |
1214+
| m68k | sid | m68k | m68k-linux-gnu | zero |
1215+
| alpha | sid | alpha | alpha-linux-gnu | zero |
1216+
| sh4 | sid | sh4 | sh4-linux-gnu | zero |
12171217
12181218
### Building for ARM/aarch64
12191219

0 commit comments

Comments
 (0)