Handle aarch64 defines seperate from arm

[windelbouwman]

aarch64 is a different architecture than arm. Some
compilers might choke when both arm and aarch64
are defined.

This change seperates the checks for arm and for
aarch64 in the isa_defs.h header files.

Signed-off-by: Windel Bouwman [email protected]

Motivation and Context

Description

How Has This Been Tested?

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Performance enhancement (non-breaking change which improves efficiency)
• Code cleanup (non-breaking change which makes code smaller or more readable)
• Breaking change (fix or feature that would cause existing functionality to change)
• Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
• Documentation (a change to man pages or other documentation)

Checklist:

• My code follows the OpenZFS code style requirements.
• I have updated the documentation accordingly.
• I have read the contributing document.
• I have added tests to cover my changes.
• I have run the ZFS Test Suite with this change applied.
• All commit messages are properly formatted and contain Signed-off-by.

[windelbouwman]

This tries to address issue #10335

[windelbouwman]

Sidenote: the isa_defs.h header files look pretty similar (they are not however), maybe those files could be collapsed in a single file?

[behlendorf]

Thanks for taking a look at this, splitting up arm and aarch64 is definitely overdue. As for merging these two files I'd prefer to keep them separate at least for now. If we were going to merge them I think we'd want to see if all three could be unified.

./include/os/freebsd/spl/sys/isa_defs.h
./include/os/linux/spl/sys/isa_defs.h
./lib/libspl/include/sys/isa_defs.h

@cveilleux @c-goes if you have a chance it would be helpful if you could verify the build fix on your setup.

[windelbouwman]

For what it's worth, I faced this issue during the development of a bitbake recipe, which is located here:

https://gist.github.com/windelbouwman/1e3deb742c0a5ae399f876ca2eb1b0f1

[lundman]

Oh yes please, M1 arm64 has to comment out a bunch of aarch64 checks, and NEON stuff.

[behlendorf]

@windelbouwman I've gone ahead and marked this draft as ready for review. It would still be nice to get some additional build testing, but this is straight forward enough I think we can proceed with merging it.