Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
接近 2 年 前同步成功

通知 12
Star 18
Fork 1
T
Third Party Openssl
提交 3c3badcf 编写于 作者: A Andy Polyakov
浏览文件
操作

Configurations/10-main.conf: further HP-UX cleanups/unifications. 

Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 eb8e052c
隐藏空白更改
内联 并排
Showing with 18 addition and 42 deletion
Configurations/10-main.conf
浏览文件 @ 3c3badcf
...@@ -452,23 +452,26 @@ my %targets = ( ...@@ -452,23 +452,26 @@ my %targets = (
# targets; b) performance-critical 32-bit assembly modules implement # targets; b) performance-critical 32-bit assembly modules implement
# even PA-RISC 2.0-specific code paths, which are chosen at run-time, # even PA-RISC 2.0-specific code paths, which are chosen at run-time,
# thus adequate performance is provided even with PA-RISC 1.1 build. # thus adequate performance is provided even with PA-RISC 1.1 build.
"hpux-network" => { "hpux-common" => {
inherit_from => [ "BASE_unix" ],
template => 1, template => 1,
defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED", defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED",
"_HPUX_ALT_XOPEN_SOCKET_API"), "_HPUX_ALT_XOPEN_SOCKET_API"),
lib_cppflags => "-DB_ENDIAN",
thread_scheme => "pthreads",
dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds
shared_target => "hpux-shared",
}, },
"hpux-parisc-gcc" => { "hpux-parisc-gcc" => {
inherit_from => [ "BASE_unix", "hpux-network" ], inherit_from => [ "hpux-common" ],
CC => "gcc", CC => "gcc",
CFLAGS => picker(debug => "-O0 -g", CFLAGS => picker(debug => "-O0 -g",
release => "-O3"), release => "-O3"),
cflags => add(threads("-pthread")), cflags => add(threads("-pthread")),
lib_cppflags => "-DB_ENDIAN -DBN_DIV2W", lib_cppflags => add("-DBN_DIV2W"),
ex_libs => add("-ldld", threads("-pthread")), ex_libs => add("-ldld", threads("-pthread")),
bn_ops => "BN_LLONG", bn_ops => "BN_LLONG RC4_CHAR",
thread_scheme => "pthreads",
dso_scheme => "dl", dso_scheme => "dl",
shared_target => "hpux-shared",
shared_cflag => "-fPIC", shared_cflag => "-fPIC",
shared_ldflag => "-shared", shared_ldflag => "-shared",
shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
...@@ -478,18 +481,13 @@ my %targets = ( ...@@ -478,18 +481,13 @@ my %targets = (
multilib => "/pa1.1", multilib => "/pa1.1",
}, },
"hpux64-parisc2-gcc" => { "hpux64-parisc2-gcc" => {
inherit_from => [ "BASE_unix", "hpux-network", inherit_from => [ "hpux-common", asm("parisc20_64_asm") ],
asm("parisc20_64_asm") ],
CC => "gcc", CC => "gcc",
CFLAGS => combine(picker(debug => "-O0 -g", CFLAGS => combine(picker(debug => "-O0 -g",
release => "-O3")), release => "-O3")),
cflags => add(threads("-pthread")), cflags => add(threads("-pthread")),
lib_cppflags => "-DB_ENDIAN",
ex_libs => add("-ldl", threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "-fpic", shared_cflag => "-fpic",
shared_ldflag => "-shared", shared_ldflag => "-shared",
shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
...@@ -498,18 +496,16 @@ my %targets = ( ...@@ -498,18 +496,16 @@ my %targets = (
# More attempts at unified 10.X and 11.X targets for HP C compiler. # More attempts at unified 10.X and 11.X targets for HP C compiler.
"hpux-parisc-cc" => { "hpux-parisc-cc" => {
inherit_from => [ "BASE_unix", "hpux-network" ], inherit_from => [ "hpux-common" ],
CC => "cc", CC => "cc",
CFLAGS => picker(debug => "+O0 +d -g", CFLAGS => picker(debug => "+O0 +d -g",
release => "+O3"), release => "+O3"),
cflags => "+Optrs_strongly_typed -Ae +ESlit", cflags => "+Optrs_strongly_typed -Ae +ESlit",
cppflags => threads("-D_REENTRANT"), cppflags => threads("-D_REENTRANT"),
lib_cppflags => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY", lib_cppflags => add("-DBN_DIV2W -DMD32_XARRAY"),
ex_libs => add("-ldld", threads("-lpthread")), ex_libs => add("-ldld", threads("-lpthread")),
bn_ops => "RC4_CHAR", bn_ops => "RC4_CHAR",
thread_scheme => "pthreads",
dso_scheme => "dl", dso_scheme => "dl",
shared_target => "hpux-shared",
shared_cflag => "+Z", shared_cflag => "+Z",
shared_ldflag => "-b", shared_ldflag => "-b",
shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
...@@ -520,19 +516,15 @@ my %targets = ( ...@@ -520,19 +516,15 @@ my %targets = (
multilib => "/pa1.1", multilib => "/pa1.1",
}, },
"hpux64-parisc2-cc" => { "hpux64-parisc2-cc" => {
inherit_from => [ "BASE_unix", "hpux-network", inherit_from => [ "hpux-common", asm("parisc20_64_asm") ],
asm("parisc20_64_asm") ],
CC => "cc", CC => "cc",
CFLAGS => picker(debug => "+O0 +d -g", CFLAGS => picker(debug => "+O0 +d -g",
release => "+O3") , release => "+O3") ,
cflags => "+DD64 +Optrs_strongly_typed -Ae +ESlit", cflags => "+DD64 +Optrs_strongly_typed -Ae +ESlit",
cppflags => threads("-D_REENTRANT") , cppflags => threads("-D_REENTRANT") ,
lib_cppflags => "-DB_ENDIAN -DMD32_XARRAY", lib_cppflags => add("-DMD32_XARRAY"),
ex_libs => add("-ldl", threads("-lpthread")), ex_libs => add("-ldl", threads("-lpthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "+Z", shared_cflag => "+Z",
shared_ldflag => "-b", shared_ldflag => "-b",
shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
...@@ -541,36 +533,28 @@ my %targets = ( ...@@ -541,36 +533,28 @@ my %targets = (
# HP/UX IA-64 targets # HP/UX IA-64 targets
"hpux-ia64-cc" => { "hpux-ia64-cc" => {
inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ], inherit_from => [ "hpux-common", asm("ia64_asm") ],
CC => "cc", CC => "cc",
CFLAGS => picker(debug => "+O0 +d -g", CFLAGS => picker(debug => "+O0 +d -g",
release => "+O2"), release => "+O2"),
cflags => "-Ae +DD32 +Olit=all -z", cflags => "-Ae +DD32 +Olit=all -z",
cppflags => add(threads("-D_REENTRANT")), cppflags => add(threads("-D_REENTRANT")),
lib_cppflags => "-DB_ENDIAN",
ex_libs => add("-ldl", threads("-lpthread")), ex_libs => add("-ldl", threads("-lpthread")),
bn_ops => "SIXTY_FOUR_BIT", bn_ops => "SIXTY_FOUR_BIT",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "+Z", shared_cflag => "+Z",
shared_ldflag => "-b", shared_ldflag => "-b",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
multilib => "/hpux32", multilib => "/hpux32",
}, },
"hpux64-ia64-cc" => { "hpux64-ia64-cc" => {
inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ], inherit_from => [ "hpux-common", asm("ia64_asm") ],
CC => "cc", CC => "cc",
CFLAGS => picker(debug => "+O0 +d -g", CFLAGS => picker(debug => "+O0 +d -g",
release => "+O3"), release => "+O3"),
cflags => "-Ae +DD64 +Olit=all -z", cflags => "-Ae +DD64 +Olit=all -z",
cppflags => threads("-D_REENTRANT"), cppflags => threads("-D_REENTRANT"),
lib_cppflags => "-DB_ENDIAN",
ex_libs => add("-ldl", threads("-lpthread")), ex_libs => add("-ldl", threads("-lpthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "+Z", shared_cflag => "+Z",
shared_ldflag => "-b", shared_ldflag => "-b",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
...@@ -578,34 +562,26 @@ my %targets = ( ...@@ -578,34 +562,26 @@ my %targets = (
}, },
# GCC builds... # GCC builds...
"hpux-ia64-gcc" => { "hpux-ia64-gcc" => {
inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ], inherit_from => [ "hpux-common", asm("ia64_asm") ],
CC => "gcc", CC => "gcc",
CFLAGS => picker(debug => "-O0 -g", CFLAGS => picker(debug => "-O0 -g",
release => "-O3"), release => "-O3"),
cflags => add(threads("-pthread")), cflags => add(threads("-pthread")),
lib_cppflags => "-DB_ENDIAN",
ex_libs => add("-ldl", threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT", bn_ops => "SIXTY_FOUR_BIT",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "-fpic", shared_cflag => "-fpic",
shared_ldflag => "-shared", shared_ldflag => "-shared",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
multilib => "/hpux32", multilib => "/hpux32",
}, },
"hpux64-ia64-gcc" => { "hpux64-ia64-gcc" => {
inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ], inherit_from => [ "hpux-common", asm("ia64_asm") ],
CC => "gcc", CC => "gcc",
CFLAGS => picker(debug => "-O0 -g", CFLAGS => picker(debug => "-O0 -g",
release => "-O3"), release => "-O3"),
cflags => combine("-mlp64", threads("-pthread")), cflags => combine("-mlp64", threads("-pthread")),
lib_cppflags => "-DB_ENDIAN",
ex_libs => add("-ldl", threads("-pthread")), ex_libs => add("-ldl", threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "hpux-shared",
shared_cflag => "-fpic", shared_cflag => "-fpic",
shared_ldflag => "-shared", shared_ldflag => "-shared",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或