Merge branch 'riscv'
diff --git a/target-riscv.c b/target-riscv.c
index 7a18497..d30be04 100644
--- a/target-riscv.c
+++ b/target-riscv.c
@@ -16,11 +16,12 @@
 #define RISCV_COMP	(1 << 8)
 #define RISCV_EMBD	(1 << 9)
 #define RISCV_FPU	(RISCV_FLOAT|RISCV_DOUBLE|RISCV_FDIV)
-#define RISCV_GENERIC	(RISCV_MUL|RISCV_DIV|RISCV_ATOMIC|RISCV_FPU)
+#define RISCV_GENERIC	(RISCV_MUL|RISCV_DIV|RISCV_ATOMIC|RISCV_FPU|RISCV_ZICSR|RISCV_ZIFENCEI)
 #define RISCV_ZICSR	(1 << 10)
 #define RISCV_ZIFENCEI	(1 << 11)
 #define RISCV_ZICBOM	(1 << 12)
 #define RISCV_ZIHINTPAUSE	(1 << 13)
+#define RISCV_VECTOR	(1 << 14)
 
 static unsigned int riscv_flags;
 
@@ -41,6 +42,7 @@
 		{ "f",		RISCV_FLOAT|RISCV_FDIV|RISCV_ZICSR },
 		{ "d",		RISCV_DOUBLE|RISCV_FDIV|RISCV_ZICSR },
 		{ "c",		RISCV_COMP },
+		{ "v",		RISCV_VECTOR|RISCV_FPU|RISCV_ZICSR },
 		{ "_zicsr",	RISCV_ZICSR },
 		{ "_zifencei",	RISCV_ZIFENCEI },
 		{ "_zicbom",	RISCV_ZICBOM },
@@ -139,6 +141,12 @@
 		predefine("__riscv_zicbom", 1, "1");
 	if (riscv_flags & RISCV_ZIHINTPAUSE)
 		predefine("__riscv_zihintpause", 1, "1");
+	if (riscv_flags & RISCV_VECTOR) {
+		predefine("__riscv_vector", 1, "1");
+		predefine("__riscv_v_min_vlen", 1, "128");
+		predefine("__riscv_v_elen", 1, "64");
+		predefine("__riscv_v_elen_fp", 1, "64");
+	}
 
 	if (cmodel)
 		predefine_strong("__riscv_cmodel_%s", cmodel);