@@ -127,22 +127,42 @@ rec {
127127 (b == i386 && isCompatible a i486)
128128 (b == i486 && isCompatible a i586)
129129 (b == i586 && isCompatible a i686)
130− # NOTE: Not true in some cases. Like in WSL mode.
130+
131+ # XXX: Not true in some cases. Like in WSL mode.
131132 (b == i686 && isCompatible a x86_64)
132133
133− # ARM
134+ # ARMv4
134135 (b == arm && isCompatible a armv5tel)
135− (b == armv5tel && isCompatible a armv6m)
136− (b == armv6m && isCompatible a armv6l)
137− (b == armv6l && isCompatible a armv7a)
138− (b == armv7a && isCompatible a armv7r)
139− (b == armv7r && isCompatible a armv7m)
140− (b == armv7m && isCompatible a armv7l)
141− (b == armv7l && isCompatible a armv8a)
142− (b == armv8a && isCompatible a armv8r)
143− (b == armv8r && isCompatible a armv8m)
144− # NOTE: not always true! Some arm64 cpus don’t support arm32 mode.
145− (b == armv8m && isCompatible a aarch64)
136+
137+ # ARMv5
138+ (b == armv5tel && isCompatible a armv6l)
139+
140+ # ARMv6
141+ (b == armv6l && isCompatible a armv6m)
142+ (b == armv6m && isCompatible a armv7l)
143+
144+ # ARMv7
145+ (b == armv7l && isCompatible a armv7a)
146+ (b == armv7l && isCompatible a armv7r)
147+ (b == armv7l && isCompatible a armv7m)
148+ (b == armv7a && isCompatible a armv8a)
149+ (b == armv7r && isCompatible a armv8a)
150+ (b == armv7m && isCompatible a armv8a)
151+ (b == armv7a && isCompatible a armv8r)
152+ (b == armv7r && isCompatible a armv8r)
153+ (b == armv7m && isCompatible a armv8r)
154+ (b == armv7a && isCompatible a armv8m)
155+ (b == armv7r && isCompatible a armv8m)
156+ (b == armv7m && isCompatible a armv8m)
157+
158+ # ARMv8
159+ (b == armv8r && isCompatible a armv8a)
160+ (b == armv8m && isCompatible a armv8a)
161+
162+ # XXX: not always true! Some arm64 cpus don’t support arm32 mode.
163+ (b == aarch64 && a == armv8a)
164+ (b == armv8a && isCompatible a aarch64)
165+
146166 (b == aarch64 && a == aarch64_be)
147167 (b == aarch64_be && isCompatible a aarch64)
148168