Provide a few examples by converting my own strings to hash table configurations

Reviewed-by: Andy Polyakov <appro@openssl.org>

1 files changed, 101 insertions, 4 deletions

diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index cfc2b1653c..859d1c452f 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -27,10 +27,107 @@ my $no_asm_filler="::::::::::::::::void";
 "debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+    # Richard Levitte
+    "levitte-linux-mips64" => {
+	base_templates		=> [ "mips64_asm" ],
+	cc			=> "gcc",
+	cflags			=> "-mabi=n32 -O3 -Wall -DBN_DIV3W",
+	unistd			=> "",
+	thread_cflag		=> "-D_REENTRANT",
+	sys_id			=> "",
+	lflags			=> "-ldl",
+	bn_ops			=> "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+	perlasm_scheme		=> "n32",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_ldflag		=> "-mabi=n32",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+	ranlib			=> "",
+	arflags			=> "",
+	multilib		=> "32"
+    },
+    "levitte-linux64-mips64" => {
+	base_templates		=> [ "mips64_asm" ],
+	cc			=> "gcc",
+	cflags			=> "-mabi=64 -O3 -Wall -DBN_DIV3W",
+	unistd			=> "",
+	thread_cflag		=> "-D_REENTRANT",
+	sys_id			=> "",
+	lflags			=> "-ldl",
+	bn_ops			=> "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
+	perlasm_scheme		=> "64",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_ldflag		=> "-mabi=64",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+	ranlib			=> "",
+	arflags			=> "",
+	multilib		=> "64",
+    },
+    "levitte-linux-elf" => {
+	base_templates		=> [ "x86_elf_asm" ],
+	cc			=> "gcc",
+	cflags			=> "-DL_ENDIAN -Wall",
+	"debug-cflags"		=> "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3",
+	thread_cflag		=> "-D_REENTRANT",
+	lflags			=> "-ldl",
+	bn_ops			=> "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)"
+    },
+    "debug-levitte-linux-noasm" => {
+	base_templates		=> [ "no_asm_filler" ],
+	cc			=> "gcc",
+	cflags			=> "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
+	unistd			=> "",
+	thread_cflag		=> "-D_REENTRANT",
+	sys_id			=> "",
+	lflags			=> "-ldl",
+	bn_ops			=> "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_ldflag		=> "",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)"
+    },
+    "debug-levitte-linux-elf-extreme" => {
+	base_templates		=> [ "x86_elf_asm" ],
+	cc			=> "gcc",
+	cflags			=> "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+	unistd			=> "",
+	thread_cflag		=> "-D_REENTRANT",
+	sys_id			=> "",
+	lflags			=> "-ldl",
+	bn_ops			=> "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+	perlasm_scheme		=> "elf",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_ldflag		=> "",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)"
+    },
+    "debug-levitte-linux-noasm-extreme" => {
+	base_templates		=> [ "no_asm_filler" ],
+	cc			=> "gcc",
+	cflags			=> "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
+	unistd			=> "",
+	thread_cflag		=> "-D_REENTRANT",
+	sys_id			=> "",
+	lflags			=> "-ldl",
+	bn_ops			=> "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
+	perlasm_scheme		=> "void",
+	dso_scheme		=> "dlfcn",
+	shared_target		=> "linux-shared",
+	shared_cflag		=> "-fPIC",
+	shared_ldflag		=> "",
+	shared_extension	=> ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)"
+    },
+
 "debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm_filler}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",