generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fips_canister.c: more cross-compiler platfroms verified.

Browse Source
This commit is contained in:
Andy Polyakov 2011-10-19 21:05:53 +00:00
parent 3ee4d41fe1
commit 552e412abc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fips/fips_canister.c
View File

@ -30,8 +30,10 @@ const void *FIPS_text_end(void);
#if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE) #if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)
# if (defined(__ANDROID__) && (defined(__arm__) || defined(__arm) || \ # if (defined(__ANDROID__) && (defined(__arm__) || defined(__arm) || \
defined(__i386__)|| defined(__i386))) || \ defined(__i386__)|| defined(__i386))) || \
(defined(__vxworks) && (defined(__ppc__) || defined(__ppc))) || \ (defined(__vxworks) && (defined(__ppc__) || defined(__ppc) || \
(defined(__linux) && defined(__PPC__) && !defined(__PPC64__)) defined(__mips__)|| defined(__mips))) || \
(defined(__linux) && ((defined(__PPC__) && !defined(__PPC64__)) || \
defined(__arm__) || defined(__arm)))
# define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE # define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
# endif # endif
#endif #endif
@ -166,7 +168,11 @@ static void *instruction_pointer(void)
const void *FIPS_ref_point() const void *FIPS_ref_point()
{ {
#if defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE) #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; return (void *)instruction_pointer;
# endif
#elif defined(INSTRUCTION_POINTER_IMPLEMENTED) #elif defined(INSTRUCTION_POINTER_IMPLEMENTED)
return instruction_pointer(); return instruction_pointer();
/* Below we essentially cover vendor compilers which do not support /* Below we essentially cover vendor compilers which do not support