Skip to content

Commit

Permalink
Add _ALIGNMENT_REQUIRED to isa_defs.h for checksums
Browse files Browse the repository at this point in the history
_ALIGNMENT_REQUIRED needs to be #defined in isa_defs.h in order to
port the Illumos checksum code to ZoL:

4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
OpenZFS-issue: https://www.illumos.org/issues/4185
OpenZFS-commit: openzfs/openzfs@45818ee

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#561
  • Loading branch information
tonyhutter authored and behlendorf committed Jun 21, 2016
1 parent 16fc1ec commit 5ad98ad
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions include/sys/isa_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
#define _LP64
#endif

#define _ALIGNMENT_REQUIRED 1


/* i386 arch specific defines */
#elif defined(__i386) || defined(__i386__)

Expand All @@ -59,6 +62,8 @@
#define _ILP32
#endif

#define _ALIGNMENT_REQUIRED 0

/* powerpc (ppc64) arch specific defines */
#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__)

Expand All @@ -80,6 +85,12 @@
#endif
#endif

/*
* Illumos doesn't define _ALIGNMENT_REQUIRED for PPC, so default to 1
* out of paranoia.
*/
#define _ALIGNMENT_REQUIRED 1

/* arm arch specific defines */
#elif defined(__arm) || defined(__arm__) || defined(__aarch64__)

Expand Down Expand Up @@ -107,6 +118,12 @@
#define _BIG_ENDIAN
#endif

/*
* Illumos doesn't define _ALIGNMENT_REQUIRED for ARM, so default to 1
* out of paranoia.
*/
#define _ALIGNMENT_REQUIRED 1

/* sparc arch specific defines */
#elif defined(__sparc) || defined(__sparc__)

Expand All @@ -130,6 +147,7 @@

#define _BIG_ENDIAN
#define _SUNOS_VTOC_16
#define _ALIGNMENT_REQUIRED 1

/* s390 arch specific defines */
#elif defined(__s390__)
Expand All @@ -145,6 +163,12 @@

#define _BIG_ENDIAN

/*
* Illumos doesn't define _ALIGNMENT_REQUIRED for s390, so default to 1
* out of paranoia.
*/
#define _ALIGNMENT_REQUIRED 1

/* MIPS arch specific defines */
#elif defined(__mips__)

Expand All @@ -162,6 +186,12 @@

#define _SUNOS_VTOC_16

/*
* Illumos doesn't define _ALIGNMENT_REQUIRED for MIPS, so default to 1
* out of paranoia.
*/
#define _ALIGNMENT_REQUIRED 1

#else
/*
* Currently supported:
Expand Down

0 comments on commit 5ad98ad

Please sign in to comment.