| 1 | Upstream-status: Taken from upstream:
|
| 2 |
|
| 3 | <https://github.com/openssl/openssl/commit/7c729851d169f30d9e0c0ad6e7c1cf6cefb37935>.
|
| 4 |
|
| 5 | From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001
|
| 6 | From: Janneke Nieuwenhuizen <[email protected]>
|
| 7 | Date: Thu, 7 Nov 2024 14:08:05 +0100
|
| 8 | Subject: [PATCH] Add support for the 64bit Hurd.
|
| 9 | Content-Transfer-Encoding: 8bit
|
| 10 | Content-Type: text/plain; charset=UTF-8
|
| 11 |
|
| 12 | Taken from <https://salsa.debian.org/debian/openssl>.
|
| 13 | ---
|
| 14 | Configurations/10-main.conf | 45 ++++++++++++++++++++++++++++++++-----
|
| 15 | util/perl/OpenSSL/config.pm | 3 ++-
|
| 16 | 2 files changed, 41 insertions(+), 7 deletions(-)
|
| 17 |
|
| 18 | diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
|
| 19 | index b578a3c2a8..740460ebd3 100644
|
| 20 | |
| 21 | |
| 22 | @@ -1685,20 +1685,53 @@ my %targets = (
|
| 23 | },
|
| 24 |
|
| 25 | ##### GNU Hurd
|
| 26 | - "hurd-x86" => {
|
| 27 | + "hurd-generic32" => {
|
| 28 | inherit_from => [ "BASE_unix" ],
|
| 29 | CC => "gcc",
|
| 30 | - CFLAGS => "-O3 -fomit-frame-pointer -Wall",
|
| 31 | + CXX => "g++",
|
| 32 | + CFLAGS => picker(default => "-Wall",
|
| 33 | + debug => "-O0 -g",
|
| 34 | + release => "-O3"),
|
| 35 | + CXXFLAGS => picker(default => "-Wall",
|
| 36 | + debug => "-O0 -g",
|
| 37 | + release => "-O3"),
|
| 38 | cflags => threads("-pthread"),
|
| 39 | - lib_cppflags => "-DL_ENDIAN",
|
| 40 | + cxxflags => combine("-std=c++11", threads("-pthread")),
|
| 41 | ex_libs => add("-ldl", threads("-pthread")),
|
| 42 | - bn_ops => "BN_LLONG",
|
| 43 | - asm_arch => 'x86',
|
| 44 | - perlasm_scheme => 'elf',
|
| 45 | + bn_ops => "BN_LLONG RC4_CHAR",
|
| 46 | thread_scheme => "pthreads",
|
| 47 | dso_scheme => "dlfcn",
|
| 48 | shared_target => "linux-shared",
|
| 49 | shared_cflag => "-fPIC",
|
| 50 | + shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
|
| 51 | + },
|
| 52 | +
|
| 53 | + "hurd-generic64" => {
|
| 54 | + inherit_from => [ "hurd-generic32" ],
|
| 55 | + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
| 56 | + },
|
| 57 | +
|
| 58 | + #### X86 / X86_64 targets
|
| 59 | + "hurd-x86" => {
|
| 60 | + inherit_from => [ "hurd-generic32" ],
|
| 61 | + CFLAGS => add(picker(release => "-fomit-frame-pointer")),
|
| 62 | + cflags => add("-m32"),
|
| 63 | + cxxflags => add("-m32"),
|
| 64 | + lib_cppflags => add("-DL_ENDIAN"),
|
| 65 | + bn_ops => "BN_LLONG",
|
| 66 | + asm_arch => 'x86',
|
| 67 | + perlasm_scheme => 'elf',
|
| 68 | + },
|
| 69 | +
|
| 70 | + "hurd-x86_64" => {
|
| 71 | + inherit_from => [ "hurd-generic64" ],
|
| 72 | + cflags => add("-m64"),
|
| 73 | + cxxflags => add("-m64"),
|
| 74 | + lib_cppflags => add("-DL_ENDIAN"),
|
| 75 | + bn_ops => "SIXTY_FOUR_BIT_LONG",
|
| 76 | + asm_arch => 'x86_64',
|
| 77 | + perlasm_scheme => 'elf',
|
| 78 | + multilib => "64",
|
| 79 | },
|
| 80 |
|
| 81 | ##### VxWorks for various targets
|
| 82 | diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
|
| 83 | index 2f1edcafb6..707db71537 100755
|
| 84 | |
| 85 | |
| 86 | @@ -92,7 +92,8 @@ my $guess_patterns = [
|
| 87 | [ 'IRIX64:.*', 'mips4-sgi-irix64' ],
|
| 88 | [ 'Linux:[2-9]\..*', '${MACHINE}-whatever-linux2' ],
|
| 89 | [ 'Linux:1\..*', '${MACHINE}-whatever-linux1' ],
|
| 90 | - [ 'GNU.*', 'hurd-x86' ],
|
| 91 | + [ 'GNU:.*86-AT386', 'hurd-x86' ],
|
| 92 | + [ 'GNU:.*86_64-AT386', 'hurd-x86_64' ],
|
| 93 | [ 'LynxOS:.*', '${MACHINE}-lynx-lynxos' ],
|
| 94 | # BSD/OS always says 386
|
| 95 | [ 'BSD\/OS:4\..*', 'i486-whatever-bsdi4' ],
|
| 96 | --
|
| 97 | Janneke Nieuwenhuizen <[email protected]> | GNU LilyPond https://LilyPond.org
|
| 98 | Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
|
| 99 |
|