fips_canister.c: more cross-compiler platfroms verified.

[openssl.git] / fips / fips_canister.c

diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index a209172f437d41aa42b6b6c2fd0e3e7f1aa49d86..4f187948a23368aed1e096af9cb5761c5027e81a 100644 (file)
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -28,9 +28,12 @@ const void         *FIPS_text_end(void);
 #endif
 
 #if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
-# if   (defined(__ANDROID__) && (defined(__arm__) || defined(__arm)))  || \
-       (defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)))  || \
-       (defined(__linux)     && defined(__PPC__) && !defined(__PPC64__))
+# if   (defined(__ANDROID__) && (defined(__arm__) || defined(__arm)    || \
+                                 defined(__i386__)|| defined(__i386))) || \
+       (defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)    || \
+                                 defined(__mips__)|| defined(__mips))) || \
+       (defined(__linux)     && ((defined(__PPC__) && !defined(__PPC64__)) || \
+                                 defined(__arm__) || defined(__arm)))
 #  define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
 # endif
 #endif
@@ -56,7 +59,7 @@ static void *instruction_pointer_xlc(void);
  * reference points accordingly. In case you wonder, the values are
  * big-endian encoded variable names, just to prevent these arrays
  * from being merged by linker. */
-# if defined(_MSC_VER) && defined(_WIN64)
+# if defined(_MSC_VER)
 #  pragma section("fipsro$a",read)
    __declspec(allocate("fipsro$a"))
 # endif
@@ -67,7 +70,7 @@ const unsigned int FIPS_rodata_start[]=
 # ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
 #  define instruction_pointer  FIPS_text_endX
 # endif
-# if defined(_MSC_VER) && defined(_WIN64)
+# if defined(_MSC_VER)
 #  pragma section("fipsro$c",read)
    __declspec(allocate("fipsro$c"))
 # endif
@@ -165,7 +168,11 @@ static void *instruction_pointer(void)
 const void *FIPS_ref_point()
 {
 #if    defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
+# if defined(__thumb__) || defined(__thumb)
+    return (void *)((size_t)instruction_pointer&~1);
+# else
     return (void *)instruction_pointer;
+# endif
 #elif  defined(INSTRUCTION_POINTER_IMPLEMENTED)
     return instruction_pointer();
 /* Below we essentially cover vendor compilers which do not support