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

Configurations/10-main.conf

+18 −42

Original line number	Diff line number	Diff line
		@@ -452,23 +452,26 @@ my %targets = (
		# targets; b) performance-critical 32-bit assembly modules implement
		# 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.
		"hpux-network" => {
		"hpux-common" => {
		inherit_from => [ "BASE_unix" ],
		template => 1,
		defines => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED",
		"_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" => {
		inherit_from => [ "BASE_unix", "hpux-network" ],
		inherit_from => [ "hpux-common" ],
		CC => "gcc",
		CFLAGS => picker(debug => "-O0 -g",
		release => "-O3"),
		cflags => add(threads("-pthread")),
		lib_cppflags => "-DB_ENDIAN -DBN_DIV2W",
		lib_cppflags => add("-DBN_DIV2W"),
		ex_libs => add("-ldld", threads("-pthread")),
		bn_ops => "BN_LLONG",
		thread_scheme => "pthreads",
		bn_ops => "BN_LLONG RC4_CHAR",
		dso_scheme => "dl",
		shared_target => "hpux-shared",
		shared_cflag => "-fPIC",
		shared_ldflag => "-shared",
		shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
		@@ -478,18 +481,13 @@ my %targets = (
		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(debug => "-O0 -g",
		release => "-O3")),
		cflags => add(threads("-pthread")),
		lib_cppflags => "-DB_ENDIAN",
		ex_libs => add("-ldl", threads("-pthread")),
		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_VERSION_NUMBER)",
		@@ -498,18 +496,16 @@ my %targets = (

		# More attempts at unified 10.X and 11.X targets for HP C compiler.
		"hpux-parisc-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network" ],
		inherit_from => [ "hpux-common" ],
		CC => "cc",
		CFLAGS => picker(debug => "+O0 +d -g",
		release => "+O3"),
		cflags => "+Optrs_strongly_typed -Ae +ESlit",
		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")),
		bn_ops => "RC4_CHAR",
		thread_scheme => "pthreads",
		dso_scheme => "dl",
		shared_target => "hpux-shared",
		shared_cflag => "+Z",
		shared_ldflag => "-b",
		shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
		@@ -520,19 +516,15 @@ my %targets = (
		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 => picker(debug => "+O0 +d -g",
		release => "+O3") ,
		cflags => "+DD64 +Optrs_strongly_typed -Ae +ESlit",
		cppflags => threads("-D_REENTRANT") ,
		lib_cppflags => "-DB_ENDIAN -DMD32_XARRAY",
		lib_cppflags => add("-DMD32_XARRAY"),
		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 => "-b",
		shared_extension => ".sl.\$(SHLIB_VERSION_NUMBER)",
		@@ -541,36 +533,28 @@ my %targets = (

		# 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 => picker(debug => "+O0 +d -g",
		release => "+O2"),
		cflags => "-Ae +DD32 +Olit=all -z",
		cppflags => add(threads("-D_REENTRANT")),
		lib_cppflags => "-DB_ENDIAN",
		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 => "-b",
		shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
		multilib => "/hpux32",
		},
		"hpux64-ia64-cc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		CC => "cc",
		CFLAGS => picker(debug => "+O0 +d -g",
		release => "+O3"),
		cflags => "-Ae +DD64 +Olit=all -z",
		cppflags => threads("-D_REENTRANT"),
		lib_cppflags => "-DB_ENDIAN",
		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 => "-b",
		shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
		@@ -578,34 +562,26 @@ my %targets = (
		},
		# GCC builds...
		"hpux-ia64-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		CC => "gcc",
		CFLAGS => picker(debug => "-O0 -g",
		release => "-O3"),
		cflags => add(threads("-pthread")),
		lib_cppflags => "-DB_ENDIAN",
		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_VERSION_NUMBER)",
		multilib => "/hpux32",
		},
		"hpux64-ia64-gcc" => {
		inherit_from => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
		inherit_from => [ "hpux-common", asm("ia64_asm") ],
		CC => "gcc",
		CFLAGS => picker(debug => "-O0 -g",
		release => "-O3"),
		cflags => combine("-mlp64", threads("-pthread")),
		lib_cppflags => "-DB_ENDIAN",
		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 => "-shared",
		shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",