Configurations/10-main.conf: further HP-UX cleanups/unifications. (d78cecd0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configurations/10-main.conf

+13 −33

Original line number	Diff line number	Diff line
		@@ -428,13 +428,17 @@ sub vms_info {
		# 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.
		# <appro@fy.chalmers.se>
		"hpux-network" => {
		"hpux-common" => {
		inherit_from => [ "BASE_unix" ],
		template => 1,
		defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED",
		"_HPUX_ALT_XOPEN_SOCKET_API"),
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn", # overridden in 32-bit PA-RISC builds
		shared_target => "hpux-shared",
		},
		"hpux-parisc-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network" ],
		inherit_from => [ "hpux-common" ],
		cc => "gcc",
		cflags => combine(picker(default => "-DB_ENDIAN -DBN_DIV2W",
		debug => "-O0 -g",
		@@ -442,9 +446,7 @@ sub vms_info {
		threads("-pthread")),
		ex_libs => add("-Wl,+s -ldld", threads("-pthread")),
		bn_ops => "BN_LLONG",
		thread_scheme => "pthreads",
		dso_scheme => "dl",
		shared_target => "hpux-shared",
		shared_cflag => "-fPIC",
		shared_ldflag => "-shared",
		shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -454,8 +456,7 @@ sub vms_info {
		multilib => "/pa1.1",
		},
		"hpux64-parisc2-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network",
		asm("parisc20_64_asm") ],
		inherit_from => [ "hpux-common", asm("parisc20_64_asm") ],
		cc => "gcc",
		cflags => combine(picker(default => "-DB_ENDIAN",
		debug => "-O0 -g",
		@@ -463,9 +464,6 @@ sub vms_info {
		threads("-D_REENTRANT")),
		ex_libs => add("-ldl"),
		bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "-fpic",
		shared_ldflag => "-shared",
		shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -477,7 +475,7 @@ sub vms_info {
		# Chris Ruemmler <ruemmler@cup.hp.com>
		# Kevin Steves <ks@hp.se>
		"hpux-parisc-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network" ],
		inherit_from => [ "hpux-common" ],
		cc => "cc",
		cflags => combine(picker(default => "+Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
		debug => "+O0 +d -g",
		@@ -485,9 +483,7 @@ sub vms_info {
		threads("-D_REENTRANT")),
		ex_libs => add("-Wl,+s -ldld",threads("-lpthread")),
		bn_ops => "RC4_CHAR",
		thread_scheme => "pthreads",
		dso_scheme => "dl",
		shared_target => "hpux-shared",
		shared_cflag => "+Z",
		shared_ldflag => "-b",
		shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -498,8 +494,7 @@ sub vms_info {
		multilib => "/pa1.1",
		},
		"hpux64-parisc2-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network",
		asm("parisc20_64_asm") ],
		inherit_from => [ "hpux-common", asm("parisc20_64_asm") ],
		cc => "cc",
		cflags => combine(picker(default => "+DD64 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY",
		debug => "+O0 +d -g",
		@@ -507,9 +502,6 @@ sub vms_info {
		threads("-D_REENTRANT")),
		ex_libs => add("-ldl",threads("-lpthread")),
		bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "+Z",
		shared_ldflag => "+DD64 -b",
		shared_extension => ".sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -518,7 +510,7 @@ sub vms_info {

		# HP/UX IA-64 targets
		"hpux-ia64-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		cc => "cc",
		cflags => combine(picker(default => "-Ae +DD32 +Olit=all -z -DB_ENDIAN",
		debug => "+O0 +d -g",
		@@ -526,9 +518,6 @@ sub vms_info {
		threads("-D_REENTRANT")),
		ex_libs => add("-ldl",threads("-lpthread")),
		bn_ops => "SIXTY_FOUR_BIT",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "+Z",
		shared_ldflag => "+DD32 -b",
		shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -537,7 +526,7 @@ sub vms_info {
		# Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted
		# with debugging of the following config.
		"hpux64-ia64-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		cc => "cc",
		cflags => combine(picker(default => "-Ae +DD64 +Olit=all -z -DB_ENDIAN",
		debug => "+O0 +d -g",
		@@ -545,9 +534,6 @@ sub vms_info {
		threads("-D_REENTRANT")),
		ex_libs => add("-ldl", threads("-lpthread")),
		bn_ops => "SIXTY_FOUR_BIT_LONG",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "+Z",
		shared_ldflag => "+DD64 -b",
		shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -555,7 +541,7 @@ sub vms_info {
		},
		# GCC builds...
		"hpux-ia64-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		cc => "gcc",
		cflags => combine(picker(default => "-DB_ENDIAN",
		debug => "-O0 -g",
		@@ -563,16 +549,13 @@ sub vms_info {
		threads("-pthread")),
		ex_libs => add("-ldl", threads("-pthread")),
		bn_ops => "SIXTY_FOUR_BIT",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "-fpic",
		shared_ldflag => "-shared",
		shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		multilib => "/hpux32",
		},
		"hpux64-ia64-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		cc => "gcc",
		cflags => combine(picker(default => "-mlp64 -DB_ENDIAN",
		debug => "-O0 -g",
		@@ -580,9 +563,6 @@ sub vms_info {
		threads("-pthread")),
		ex_libs => add("-ldl", threads("-pthread")),
		bn_ops => "SIXTY_FOUR_BIT_LONG",
		thread_scheme => "pthreads",
		dso_scheme => "dlfcn",
		shared_target => "hpux-shared",
		shared_cflag => "-fpic",
		shared_ldflag => "-mlp64 -shared",
		shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",