The branch master has been updated
via b4de72bf641ca195588cc7f758edda171709fdfe (commit)
from 7b7eb4725ead9440e5f68c999e0792098ea82239 (commit)
- Log -----------------------------------------------------------------
commit b4de72bf641ca195588cc7f758edda171709fdfe
Author: Andy Polyakov <ap...@openssl.org>
Date: Mon May 2 10:33:42 2016 +0200
Tru64 fixes.
Reviewed-by: Richard Levitte <levi...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 26 +++++++++++---------------
crypto/alphacpuid.pl | 2 +-
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 601dbe5..4c58f05 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 6b51731..6356b00 100644
--- a/crypto/alphacpuid.pl
+++ b/crypto/alphacpuid.pl
@@ -8,7 +8,7 @@
$output = pop;
-open STDOUT,">$stdout";
+open STDOUT,">$output";
print <<'___';
.text
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
