diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-06 16:46:56 +0200 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2023-08-04 13:34:21 -0400 |
| commit | 7c729851d169f30d9e0c0ad6e7c1cf6cefb37935 (patch) | |
| tree | 07d5cd7931ba41c1a0a437142a010cd610e321ec /Configurations | |
| parent | c791e399abba8394833a2f88abaeb69f27f33b42 (diff) | |
Add hurd-x86_64 support
This also upgrades flags similarly to the Linux configuration.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/20896)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index bcf54a2a53..b1e8ce1185 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1835,20 +1835,53 @@ my %targets = ( }, ##### GNU Hurd - "hurd-x86" => { + "hurd-generic32" => { inherit_from => [ "BASE_unix" ], CC => "gcc", - CFLAGS => "-O3 -fomit-frame-pointer -Wall", + CXX => "g++", + CFLAGS => picker(default => "-Wall", + debug => "-O0 -g", + release => "-O3"), + CXXFLAGS => picker(default => "-Wall", + debug => "-O0 -g", + release => "-O3"), cflags => threads("-pthread"), - lib_cppflags => "-DL_ENDIAN", + cxxflags => combine("-std=c++11", threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")), - bn_ops => "BN_LLONG", - asm_arch => 'x86', - perlasm_scheme => 'elf', + bn_ops => "BN_LLONG RC4_CHAR", thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "linux-shared", shared_cflag => "-fPIC", + shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, + }, + + "hurd-generic64" => { + inherit_from => [ "hurd-generic32" ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + }, + + #### X86 / X86_64 targets + "hurd-x86" => { + inherit_from => [ "hurd-generic32" ], + CFLAGS => add(picker(release => "-fomit-frame-pointer")), + cflags => add("-m32"), + cxxflags => add("-m32"), + lib_cppflags => add("-DL_ENDIAN"), + bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => 'elf', + }, + + "hurd-x86_64" => { + inherit_from => [ "hurd-generic64" ], + cflags => add("-m64"), + cxxflags => add("-m64"), + lib_cppflags => add("-DL_ENDIAN"), + bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', + perlasm_scheme => 'elf', + multilib => "64", }, ##### VxWorks for various targets |