diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-02 10:33:42 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-03 20:14:26 +0200 |
| commit | b4de72bf641ca195588cc7f758edda171709fdfe (patch) | |
| tree | bf1b8c0c25cb5110488ce6c9823ac31e793e6f0b | |
| parent | 7b7eb4725ead9440e5f68c999e0792098ea82239 (diff) | |
Tru64 fixes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | Configurations/10-main.conf | 26 | ||||
| -rw-r--r-- | crypto/alphacpuid.pl | 2 |
2 files changed, 12 insertions, 16 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 601dbe5e15..4c58f05751 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -595,23 +595,18 @@ sub vms_info { bn_ops => "BN_LLONG", }, -#### DEC Alpha OSF/1/Tru64 targets. - "osf1-alpha-gcc" => { +#### DEC Alpha Tru64 targets. Tru64 is marketing name for OSF/1 version 4 +#### and forward. In reality 'uname -s' still returns "OSF1". Originally +#### there were even osf1-* configs targeting prior versions provided, +#### but not anymore... + "tru64-alpha-gcc" => { inherit_from => [ "BASE_unix", asm("alpha_asm") ], cc => "gcc", - cflags => "-O3", - bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "(unknown)", - dso_scheme => "dlfcn", - shared_target => "alpha-osf1-shared", - shared_extension => ".so", - }, - "osf1-alpha-cc" => { - inherit_from => [ "BASE_unix", asm("alpha_asm") ], - cc => "cc", - cflags => "-std1 -tune host -O4 -readonly_strings", + cflags => combine("-std=c9x -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -O3", + threads("-pthread")), + ex_libs => "-lrt", # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", - thread_scheme => "(unknown)", + thread_scheme => "pthreads", dso_scheme => "dlfcn", shared_target => "alpha-osf1-shared", shared_extension => ".so", @@ -619,8 +614,9 @@ sub vms_info { "tru64-alpha-cc" => { inherit_from => [ "BASE_unix", asm("alpha_asm") ], cc => "cc", - cflags => combine("-std1 -tune host -fast -readonly_strings", + cflags => combine("-std1 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE -tune host -fast -readonly_strings", threads("-pthread")), + ex_libs => "-lrt", # for mlock(2) bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", dso_scheme => "dlfcn", diff --git a/crypto/alphacpuid.pl b/crypto/alphacpuid.pl index 6b51731b45..6356b00f94 100644 --- a/crypto/alphacpuid.pl +++ b/crypto/alphacpuid.pl @@ -8,7 +8,7 @@ $output = pop; -open STDOUT,">$stdout"; +open STDOUT,">$output"; print <<'___'; .text |