Remove source preprocessing and simplify configuration #94
Conversation
The corresponding features are available in all OCaml versions we support, so use them unconditionally.
The attribute `[@@noalloc]` is available in all OCaml versions we support.
Also: remove the generated `z_features.h` file, now always empty.
The version number is now extracted from META into an auxiliary zarith_version.ml file.
|
Thanks!
In |
- Remove the asm-related flags and variables (-noasm, asopt, ASFLAGS). - Simplify architecture handling (-host, "arch" variable).
|
Right, thanks for the quick feedback. I pushed two commits that implement your suggestions. |
configure
Outdated
| # Add extra options for some hosts | ||
|
|
||
| arch='none' | ||
| case $host in | ||
| x86_64-*linux-gnu|x86_64-kfreebsd-gnu) | ||
| ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef" | ||
| if test $wordsize = 32; then | ||
| # 32-bit OCaml on a 64-bit host | ||
| arch='i686' | ||
| ccopt="-m32 $ccopt" | ||
| asopt="-m32 $asopt" | ||
| else | ||
| arch='x86_64' | ||
| fi | ||
| ;; | ||
| i486-*linux-gnu|i686-*linux-gnu|i486-kfreebsd-gnu) | ||
| ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef" | ||
| arch='i686';; | ||
| i686-*cygwin) | ||
| if test "x$wordsize" = "x64"; then | ||
| ccdef="-DZ_COFF $ccdef" | ||
| arch='x86_64_mingw64' | ||
| else | ||
| ccdef="-DZ_UNDERSCORE_PREFIX -DZ_COFF $ccdef" | ||
| arch='i686' | ||
| fi | ||
| ;; | ||
| i386-*darwin* | x86_64-*darwin*) | ||
| ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef" | ||
| if test "x$wordsize" = "x64"; then | ||
| ccopt="-arch x86_64 $ccopt" | ||
| asopt="-arch x86_64 $asopt" | ||
| arch='x86_64' | ||
| checkcc | ||
| else | ||
| ccopt="-arch i386 $ccopt" | ||
| asopt="-arch i386 $asopt" | ||
| arch='i686' | ||
| checkcc | ||
| fi | ||
| ;; | ||
| armv7*-gnueabi) | ||
| arch='arm' | ||
| ;; | ||
| none) | ||
| ;; | ||
| *) | ||
| echo "unknown host $host";; | ||
| esac | ||
|
|
There was a problem hiding this comment.
Note: this switch that sets ccopt in some cases may not be needed any longer. Since we compile .c files via ocamlc, architecture-specific flags such as -m32 or -arch x86_64 are already provided by ocamlc.
There was a problem hiding this comment.
OK.
If needed in some circumstances, it is always possible to do CFLAGS=... ./configure.
There was a problem hiding this comment.
OK, I went ahead and removed this case. Let's see what CI says, esp. on macOS.
No need to add "-m32" or "-arch x86_64" C compiler options: normally, OCaml adds them when calling the C compiler to compile C files.
|
I think we could merge this. Unless you see further simplifications? |
|
OK, merging now! |
This PR is a "reboot" of #86 and #87.
Now that per-target asm files are gone and OCaml 4.04 is the minimal version supported, we can remove a number of configuration parameters and avoid the preprocessing of z.mli and z.ml.
The version number can also be handled without preprocessing, as shown in #87.