Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Re-)enable building on illumos (SmartOS, OmniOS, ...) and Solaris #10063

Merged
merged 23 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0e5be78
Enable building on illumos (SmartOS, OmniOS, ...)
tleedjarv Nov 29, 2020
01aa443
Enable stack overflow detection and naked point...
tleedjarv Nov 29, 2020
ce3ac28
Add Changes entry
tleedjarv Dec 28, 2020
3ed2abe
Identify Sun PRO compiler.
ksromanov Dec 29, 2020
f47de25
Add Sun PRO compiler support for Solaris.
ksromanov Nov 15, 2019
2e94080
Disable instrumented runtime and dependency generation on Sun PRO com…
ksromanov Dec 29, 2020
3442811
Disable _XOPEN_SOURCE definition on Sun PRO C.
ksromanov Dec 29, 2020
59d6366
Disable generation of Sun PRO ident string in preprocessor.
ksromanov Dec 29, 2020
a9bdb1d
Remove redundant solaris* section.
ksromanov Dec 29, 2020
09a8f09
Disable _XOPEN_SOURCE definition on Sun PRO C in link.c
ksromanov Dec 29, 2020
4fecc7f
Increase C optimization level on Solaris/SPARC to O4 to enforce inlin…
ksromanov Jan 2, 2021
21b2fb1
Add Solaris/SPARC section to INSTALL.adoc
ksromanov Jan 2, 2021
71025ad
Remove SUNPRO_C hacks.
ksromanov Jan 5, 2021
6619c11
Add -D_XPG6 to Sun PRO C compiler options.
ksromanov Jan 5, 2021
a035fdc
Update Sun PRO installation instructions.
ksromanov Jan 5, 2021
df0d215
Regenerate configure
tleedjarv Jan 6, 2021
c609629
Add reviewers in Changes
tleedjarv Jan 6, 2021
9390126
Remove AS conf for Solaris i386 (not supported)
tleedjarv Jan 6, 2021
be2e0ae
Check if 'as' is available on Solaris
tleedjarv Jan 6, 2021
af5860b
Define HAS_BROKEN_PRINTF on Solaris
tleedjarv Jan 8, 2021
b88e06e
Disable 32-bit builds on Solaris/illumos
tleedjarv Jan 8, 2021
4d5978f
Improve test portability
shindere Jan 12, 2021
f9914ab
Disable stack overflow detection on Solaris
tleedjarv Jan 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ Working version
(Gabriel Scherer, review by Sébastien Hinderer and David Allsopp,
report by Ralph Seichter)

- #10063: (Re-)enable building on illumos (SmartOS, OmniOS, ...) and
Oracle Solaris; x86_64/GCC and 64-bit SPARC/Sun PRO C compilers.
(partially revert #2024).
(Tõivo Leedjärv and Konstantin Romanov,
review by Gabriel Scherer, Sébastien Hinderer and Xavier Leroy)

### Bug fixes:

- #10005: Try expanding aliases in Ctype.nondep_type_rec
Expand Down
6 changes: 6 additions & 0 deletions INSTALL.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ By default, build is 32-bit. For 64-bit build, please set environment variable `
for _both_ `configure` and `make world` phases. Note, if this variable is set for only one phase,
your build will break (`ocamlrun` segfaults).
+
* For Solaris/Illumos on SPARC machines with Sun PRO compiler only 64-bit
bytecode target is supported (32-bit fails due to alignment issues; the optimization
is preset to `-O4` for inlining):

./configure CC="cc -m64"
+
If something goes wrong during the automatic configuration, or if the generated
files cause errors later on, then look at the template files:

Expand Down
1 change: 1 addition & 0 deletions Makefile.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ OTHERLIBRARIES=@otherlibraries@
# Needed for the "systhreads" package
PTHREAD_LINK=@pthread_link@
PTHREAD_CAML_LINK=$(addprefix -cclib ,$(PTHREAD_LINK))
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@

UNIX_OR_WIN32=@unix_or_win32@
UNIXLIB=@unixlib@
Expand Down
2 changes: 2 additions & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ clang __clang_major__ __clang_minor__
gcc __GNUC__ __GNUC_MINOR__
#elif defined(__xlc__) && defined(__xlC__)
xlc __xlC__ __xlC_ver__
#elif defined(__SUNPRO_C)
sunc __SUNPRO_C __SUNPRO_C
#else
unknown
#endif]
Expand Down
170 changes: 157 additions & 13 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.