s390: Renumber hardware capabilities (BZ 509562)

Plenty of room for new ones again.

Part of fixing https://bugs.kde.org/show_bug.cgi?id=509562

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index 07c39eb4ea6e4e4534607d2e474077ccba9bcf94..8aeb230ebb062dfa2dd598f2ef0e5ded99f86958 100644 (file)
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -162,17 +162,17 @@ typedef
 #define VEX_S390X_MODEL_UNKNOWN  19     /* always last in list */
 #define VEX_S390X_MODEL_MASK     0x3F
 
-#define VEX_HWCAPS_S390X_VX    (1<<18)  /* Vector facility */
-#define VEX_HWCAPS_S390X_MSA5  (1<<19)  /* Message-security-assistance facility 5 */
-#define VEX_HWCAPS_S390X_MI2   (1<<20)  /* Miscellaneous-instruction-extensions facility 2 */
-#define VEX_HWCAPS_S390X_LSC2  (1<<21)  /* Conditional load/store facility2 */
-#define VEX_HWCAPS_S390X_VXE   (1<<22)  /* Vector-enhancements facility */
-#define VEX_HWCAPS_S390X_NNPA  (1<<23)  /* NNPA facility */
-#define VEX_HWCAPS_S390X_DFLT  (1<<24)  /* Deflate-conversion facility */
-#define VEX_HWCAPS_S390X_VXE2  (1<<25)  /* Vector-enhancements facility 2 */
-#define VEX_HWCAPS_S390X_VXD   (1<<26)  /* Vector packed-decimal facility */
-#define VEX_HWCAPS_S390X_MSA8  (1<<29)  /* Message-security-assist extension 8 */
-#define VEX_HWCAPS_S390X_MSA9  (1<<30)  /* Message-security-assist extension 9 */
+#define VEX_HWCAPS_S390X_VX    (1 << 6)  /* Vector facility */
+#define VEX_HWCAPS_S390X_MSA5  (1 << 7)  /* Message-security-assistance facility 5 */
+#define VEX_HWCAPS_S390X_MI2   (1 << 8)  /* Miscellaneous-instruction-extensions facility 2 */
+#define VEX_HWCAPS_S390X_LSC2  (1 << 9)  /* Conditional load/store facility2 */
+#define VEX_HWCAPS_S390X_VXE   (1 << 10) /* Vector-enhancements facility */
+#define VEX_HWCAPS_S390X_NNPA  (1 << 11) /* NNPA facility */
+#define VEX_HWCAPS_S390X_DFLT  (1 << 12) /* Deflate-conversion facility */
+#define VEX_HWCAPS_S390X_VXE2  (1 << 13) /* Vector-enhancements facility 2 */
+#define VEX_HWCAPS_S390X_VXD   (1 << 14) /* Vector packed-decimal facility */
+#define VEX_HWCAPS_S390X_MSA8  (1 << 15) /* Message-security-assist extension 8 */
+#define VEX_HWCAPS_S390X_MSA9  (1 << 16) /* Message-security-assist extension 9 */
 
 /* Special value representing all available s390x hwcaps */
 #define VEX_HWCAPS_S390X_ALL   (VEX_HWCAPS_S390X_VX    | \