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 e4b035780b1465898cc511827328ebf38dc05a5a..4f187948a23368aed1e096af9cb5761c5027e81a 100644 (file)
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -27,10 +27,14 @@ const void         *FIPS_text_end(void);
 # endif
 #endif
 
-#if !defined(FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE)
-# if   (defined(__ANDROID__) && (defined(__arm__) || defined(__arm)))  || \
-       (defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)))
-#  define FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE
+#if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
+# 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
 
@@ -46,16 +50,30 @@ static void *instruction_pointer_xlc(void);
 #endif
 
 #ifdef FIPS_START
-#define FIPS_ref_point FIPS_text_start
+# define FIPS_ref_point FIPS_text_start
+# ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
+#  define instruction_pointer  FIPS_text_startX
+# endif
 /* Some compilers put string literals into a separate segment. As we
  * are mostly interested to hash AES tables in .rodata, we declare
  * 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)
+#  pragma section("fipsro$a",read)
+   __declspec(allocate("fipsro$a"))
+# endif
 const unsigned int FIPS_rodata_start[]=
        { 0x46495053, 0x5f726f64, 0x6174615f, 0x73746172 };
 #else
-#define FIPS_ref_point FIPS_text_end
+# define FIPS_ref_point FIPS_text_end
+# ifdef FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
+#  define instruction_pointer  FIPS_text_endX
+# endif
+# if defined(_MSC_VER)
+#  pragma section("fipsro$c",read)
+   __declspec(allocate("fipsro$c"))
+# endif
 const unsigned int FIPS_rodata_end[]=
        { 0x46495053, 0x5f726f64, 0x6174615f, 0x656e645b };
 #endif
@@ -95,7 +113,7 @@ static void *instruction_pointer(void)
                        "move   %0,$31\n\t"
                        "move   $31,%1"         /* restore ra */
                        : "=r"(ret),"=r"(scratch) );
-# elif defined(__ppc__) || defined(__ppc) || \\
+# elif defined(__ppc__) || defined(__ppc) || \
        defined(__powerpc) || defined(__powerpc__) || \
        defined(__POWERPC__) || defined(_POWER) || defined(__PPC__) || \
        defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__)
@@ -149,8 +167,12 @@ static void *instruction_pointer(void)
  */
 const void *FIPS_ref_point()
 {
-#if    defined(FIPS_REF_POINT_IS_SAFE_TO_CROSS_COMPILE)
-    return (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