projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix spelling
[openssl.git] / Configurations / 10-main.conf
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index c408763f66a4b34b55e73164479c0fcdf33f8e0b..840061f8bbe46491e466ad53890b54c210bfc99f 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -26,7 +26,7 @@
     "vos-gcc" => {
         cc               => "gcc",
         cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
         release_cflags   => "-O3",
         thread_cflag     => "(unknown)",
         sys_id           => "VOS",
@@ -35,11 +35,11 @@
         shared_extension => ".so",
     },
 
-#### Solaros configirations
+#### Solaros configurations
     "solaris-common" => {
         template         => 1,
         cflags           => "-DFILIO_H",
-        ex_libs          => "-lsocket -lnsl -ldl",
+        ex_libs          => "-lresolv -lsocket -lnsl -ldl",
         dso_scheme       => "dlfcn",
         shared_target    => "solaris-shared",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -53,7 +53,7 @@
         # with "Illegal mnemonic" error message.
         inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],
         cc               => "gcc",
-        cflags           => add_before("-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
+        cflags           => add_before(" ", "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3 -fomit-frame-pointer",
         thread_cflag     => "-pthread",
@@ -72,7 +72,7 @@
         #                                      <appro@fy.chalmers.se>
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "gcc",
-        cflags           => add_before("-m64 -Wall -DL_ENDIAN"),
+        cflags           => add_before(" ", "-m64 -Wall -DL_ENDIAN"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
@@ -87,12 +87,12 @@
     "solaris-x86-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
+        cflags           => add_before(" ", "-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add("-mt"),
-        ex_libs          => add("-lpthread"),
+        lflags           => add(" ", "-mt"),
+        ex_libs          => add(" ", "-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
@@ -100,12 +100,12 @@
     "solaris64-x86_64-cc" => {
         inherit_from     => [ "solaris-common", asm("x86_64_asm") ],
         cc               => "cc",
-        cflags           => add_before("-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
+        cflags           => add_before(" ", "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
         debug_cflags     => "-g",
         release_cflags   => "-xO5 -xdepend -xbuiltin",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add("-mt"),
-        ex_libs          => add("-lpthread"),
+        lflags           => add(" ", "-mt"),
+        ex_libs          => add(" ", "-lpthread"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
         shared_cflag     => "-KPIC",
@@ -117,7 +117,7 @@
     "solaris-sparcv7-gcc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "gcc",
-        cflags           => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),
+        cflags           => add_before(" ", "-Wall -DB_ENDIAN -DBN_DIV2W"),
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
@@ -134,7 +134,7 @@
         # -mcpu=ultrasparc
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],
         cflags           => add_before(" ", "-m32 -mcpu=ultrasparc"),
-        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
+        debug_cflags     => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",
     },
     "solaris64-sparcv9-gcc" => {
         inherit_from     => [ "solaris-sparcv9-gcc" ],
@@ -151,12 +151,12 @@
     "solaris-sparcv7-cc" => {
         inherit_from     => [ "solaris-common" ],
         cc               => "cc",
-        cflags           => add_before("-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
-        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",
+        cflags           => add_before(" ", "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
+        debug_cflags     => "-g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
         release_cflags   => "-xO5 -xdepend",
         thread_cflag     => "-D_REENTRANT",
-        lflags           => add("-mt"),
-        ex_libs          => add("-lpthread"),
+        lflags           => add(" ", "-mt"),
+        ex_libs          => add(" ", "-lpthread"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_cflag     => "-KPIC",
         shared_ldflag    => "-G -dy -z text",
@@ -496,7 +496,7 @@
     "linux-generic32" => {
         cc               => "gcc",
         cflags           => "-Wall",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG",
         release_cflags   => "-O3",
         thread_cflag     => "-pthread",
         ex_libs          => "-ldl",
@@ -607,7 +607,7 @@
         inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],
         cc               => "gcc",
         cflags           => "-march=i486 -DL_ENDIAN -Wall",
-        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",
+        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
         release_cflags   => "-O3 -fomit-frame-pointer",
         debug_ex_libs    => "-lefence",
         bn_ops           => "BN_LLONG",
@@ -716,12 +716,14 @@
         cflags           => "--linux -ea=.s -eo=.o -mv6400+ -o2 -ox -ms -pden -DOPENSSL_SMALL_FOOTPRINT",
         thread_cflag     => "-D_REENTRANT",
         bn_ops           => "BN_LLONG",
-        cpuid_obj        => "c64xpluscpuid.o",
-        bn_obj           => "bn-c64xplus.o c64xplus-gf2m.o",
-        aes_obj          => "aes-c64xplus.o aes_cbc.o aes_ctr.o",
-        sha1_obj         => "sha1-c64xplus.o sha256-c64xplus.o sha512-c64xplus.o",
-        rc4_obj          => "rc4-c64xplus.o",
-        modes_obj        => "ghash-c64xplus.o",
+        cpuid_asm_src    => "c64xpluscpuid.s",
+        bn_asm_src       => "asm/bn-c64xplus.asm c64xplus-gf2m.s",
+        aes_asm_src      => "aes-c64xplus.s aes_cbc.c aes-ctr.fake",
+        sha1_asm_src     => "sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s",
+        rc4_asm_src      => "rc4-c64xplus.s",
+        modes_asm_src    => "ghash-c64xplus.s",
+        chacha_asm_src   => "chacha-c64xplus.s",
+        poly1305_asm_src => "poly1305-c64xplus.s",
         perlasm_scheme   => "void",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
@@ -1174,6 +1176,7 @@
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL -DOPENSSL_USE_APPLINK",
         shared_ldflag    => "-static-libgcc",
+        shared_rcflag    => "--target=pe-i386",
         shared_extension => ".dll",
     },
     "mingw64" => {
@@ -1199,6 +1202,7 @@
         shared_target    => "cygwin-shared",
         shared_cflag     => "-D_WINDLL",
         shared_ldflag    => "-static-libgcc",
+        shared_rcflag    => "--target=pe-x86-64",
         shared_extension => ".dll",
     },
 
@@ -1465,7 +1469,7 @@
     },
     "vxworks-ppc750-debug" => {
         cc               => "ccppc",
-        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",
+        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",
         sys_id           => "VXWORKS",
         lflags           => "-r",
     },
@@ -1561,11 +1565,11 @@
     },
     "vms-alpha-P32" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add("/POINTER_SIZE=32"),
+       cflags           => add(" ", "/POINTER_SIZE=32"),
     },
     "vms-alpha-P64" => {
        inherit_from     => [ "vms-alpha" ],
-       cflags           => add("/POINTER_SIZE=64"),
+       cflags           => add(" ", "/POINTER_SIZE=64"),
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
@@ -1576,11 +1580,11 @@
     },
     "vms-ia64-P32" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add("/POINTER_SIZE=32"),
+       cflags           => add(" ", "/POINTER_SIZE=32"),
     },
     "vms-ia64-P64" => {
        inherit_from     => [ "vms-ia64" ],
-       cflags           => add("/POINTER_SIZE=64"),
+       cflags           => add(" ", "/POINTER_SIZE=64"),
     },
 
 );
Unnamed repository; edit this file 'description' to name the repository.