Index: docs/yaml2obj.rst
===================================================================
--- docs/yaml2obj.rst
+++ docs/yaml2obj.rst
@@ -76,6 +76,9 @@
                                  , IMAGE_FILE_MACHINE_POWERPC
                                  , IMAGE_FILE_MACHINE_POWERPCFP
                                  , IMAGE_FILE_MACHINE_R4000
+                                 , IMAGE_FILE_MACHINE_RISCV32
+                                 , IMAGE_FILE_MACHINE_RISCV64
+                                 , IMAGE_FILE_MACHINE_RISCV128
                                  , IMAGE_FILE_MACHINE_SH3
                                  , IMAGE_FILE_MACHINE_SH3DSP
                                  , IMAGE_FILE_MACHINE_SH4
Index: include/llvm/BinaryFormat/COFF.h
===================================================================
--- include/llvm/BinaryFormat/COFF.h
+++ include/llvm/BinaryFormat/COFF.h
@@ -110,6 +110,9 @@
   IMAGE_FILE_MACHINE_POWERPC = 0x1F0,
   IMAGE_FILE_MACHINE_POWERPCFP = 0x1F1,
   IMAGE_FILE_MACHINE_R4000 = 0x166,
+  IMAGE_FILE_MACHINE_RISCV32 = 0x5032,
+  IMAGE_FILE_MACHINE_RISCV64 = 0x5064,
+  IMAGE_FILE_MACHINE_RISCV128 = 0x5128,
   IMAGE_FILE_MACHINE_SH3 = 0x1A2,
   IMAGE_FILE_MACHINE_SH3DSP = 0x1A3,
   IMAGE_FILE_MACHINE_SH4 = 0x1A6,
Index: lib/ObjectYAML/COFFYAML.cpp
===================================================================
--- lib/ObjectYAML/COFFYAML.cpp
+++ lib/ObjectYAML/COFFYAML.cpp
@@ -75,6 +75,9 @@
   ECase(IMAGE_FILE_MACHINE_POWERPC);
   ECase(IMAGE_FILE_MACHINE_POWERPCFP);
   ECase(IMAGE_FILE_MACHINE_R4000);
+  ECase(IMAGE_FILE_MACHINE_RISCV32);
+  ECase(IMAGE_FILE_MACHINE_RISCV64);
+  ECase(IMAGE_FILE_MACHINE_RISCV128);
   ECase(IMAGE_FILE_MACHINE_SH3);
   ECase(IMAGE_FILE_MACHINE_SH3DSP);
   ECase(IMAGE_FILE_MACHINE_SH4);
Index: tools/llvm-readobj/COFFDumper.cpp
===================================================================
--- tools/llvm-readobj/COFFDumper.cpp
+++ tools/llvm-readobj/COFFDumper.cpp
@@ -341,6 +341,9 @@
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_POWERPC  ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_POWERPCFP),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_R4000    ),
+  LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_RISCV32  ),
+  LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_RISCV64  ),
+  LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_RISCV128 ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_SH3      ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_SH3DSP   ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_SH4      ),