Build with --strict-warnings on FreeBSD.

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index aa4c76acfab414258a12150a9732c548f71cec19..15af87ea1a0e2f8ea306aba4c8fa3cdd1154e776 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -131,7 +131,7 @@
     },
     "solaris-sparcv8-gcc" => {
         inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
-        cflags           => sub { join(" ","-mv8",@_); },
+        cflags           => sub { join(" ","-mcpu=v8",@_); },
     },
     "solaris-sparcv9-gcc" => {
         # -m32 should be safe to add as long as driver recognizes
@@ -641,14 +641,7 @@
     "linux-x86_64-clang" => {
         inherit_from     => [ "linux-x86_64" ],
         cc               => "clang",
-        # TODO(openssl-team): fix problems and investigate if (at least) the
-        # following warnings can also be enabled:
-        # -Wconditional-uninitialized, -Wswitch-enum, -Wunused-macros,
-        # -Wmissing-field-initializers, -Wmissing-variable-declarations,
-        # -Wincompatible-pointer-types-discards-qualifiers, -Wcast-align,
-        # -Wunreachable-code -Wunused-parameter -Wlanguage-extension-token
-        # -Wextended-offsetof
-        cflags           => "-m64 -DL_ENDIAN -Wall -Wextra $clang_disabled_warnings -Qunused-arguments",
+        cflags           => "-m64 -DL_ENDIAN -Wall -Wextra -Qunused-arguments",
     },
     "linux-x32" => {
         inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],
@@ -702,7 +695,7 @@
     # patiently assisted with debugging of following two configs.
     "linux-sparcv8" => {
         inherit_from     => [ "linux-generic32", asm("sparcv8_asm") ],
-        cflags           => "-mv8 -Wall -DB_ENDIAN -DBN_DIV2W",
+        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN -DBN_DIV2W",
     },
     "linux-sparcv9" => {
         # it's a real mess with -mcpu=ultrasparc option under Linux,
@@ -816,6 +809,18 @@
         perlasm_scheme   => "o32",
     },
 
+    "android64" => {
+        inherit_from     => [ "linux-generic64" ],
+        cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
+        debug_cflags     => "-O0 -g",
+        lflags           => "-pie%-ldl",
+        shared_cflag     => "",
+    },
+    "android64-aarch64" => {
+        inherit_from     => [ "android64", asm("aarch64_asm") ],
+        perlasm_scheme   => "linux64",
+    },
+
 #### *BSD
     "BSD-generic32" => {
         # As for thread_cflag. Idea is to maintain "collective" set of
@@ -825,7 +830,7 @@
         # expands it as -lc_r, which has to be accompanied by explicit
         # -D_THREAD_SAFE and sometimes -D_REENTRANT. FreeBSD 5.x
         # expands it as -lc_r, which seems to be sufficient?
-        cc               => "gcc",
+        cc               => "cc",
         cflags           => "-Wall",
         debug_cflags     => "-O0 -g",
         release_cflags   => "-O3",
@@ -856,7 +861,7 @@
 
     "BSD-sparcv8" => {
         inherit_from     => [ "BSD-generic32", asm("sparcv8_asm") ],
-        cflags           => "-mv8 -Wall -DB_ENDIAN",
+        cflags           => "-mcpu=v8 -Wall -DB_ENDIAN",
     },
     "BSD-sparc64" => {
         # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
@@ -1379,6 +1384,15 @@
         cflags           => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
     },
+    "ios-cross" => {
+        inherit_from     => [ "darwin-common", asm("armv4_asm") ],
+        # It should be possible to go below iOS 6 and even add -arch armv6,
+        # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant
+        # at this point.
+        cflags           => "-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
+        sys_id           => "iOS",
+        perlasm_scheme   => "ios32",
+    },
     "ios64-cross" => {
         inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
         cflags           => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",