Merge branch 'polarssl-1.2' into polarssl-1.2-restricted

* polarssl-1.2:
  Disable reportedly broken assembly of Sparc(64)
This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-30 10:18:25 +01:00
commit f2256ebd43
2 changed files with 10 additions and 5 deletions

View file

@ -11,6 +11,10 @@ Security
on untrusted input or write keys of untrusted origin. Found by Guido
Vranken, Interlworks.
Bugfix
* Fix failures in MPI on Sparc(64) due to use of bad assembly code.
Found by Kurt Danielson. #292
= Version 1.2.17 released 2015-10-06
Security

View file

@ -409,10 +409,11 @@
#endif /* PPC32 */
/*
* The Sparc64 assembly is reported to be broken.
* The Sparc(64) assembly is reported to be broken.
* Disable it for now, until we're able to fix it.
*/
#if 0 && defined(__sparc__) && defined(__sparc64__)
#if 0 && defined(__sparc__)
#if defined(__sparc64__)
#define MULADDC_INIT \
asm( \
@ -443,9 +444,8 @@
: "g1", "o0", "o1", "o2", "o3", "o4", \
"o5" \
);
#endif /* SPARCv9 */
#if defined(__sparc__) && !defined(__sparc64__)
#else /* __sparc64__ */
#define MULADDC_INIT \
asm( \
@ -477,7 +477,8 @@
"o5" \
);
#endif /* SPARCv8 */
#endif /* __sparc64__ */
#endif /* __sparc__ */
#if defined(__microblaze__) || defined(microblaze)