diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-default:
-  image: debian:sid
-  before_script:
-    - apt-get update
-    - apt-get install -y git gcc cmake wget unzip g++ python libxml2-dev ninja-build python ruby python3-pip python3-psutil libz3-dev valgrind
-
-build-llvm:
-  tags:
-    - linux
-    - x86_64
-  script:
-    - mkdir build
-    - cd build
-    - cmake -G 'Unix Makefiles' -DLLVM_TARGETS_TO_BUILD='X86;WebAssembly' -DLLVM_ENABLE_PROJECTS="clang;lld" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_BUILD_32_BITS=Off -DLLVM_ENABLE_BINDINGS=Off ../llvm/
-    - make -j$(nproc) -l$(nproc) 
-    - make -j$(nproc) -l$(nproc) check-llvm-unit
-    - make -j$(nproc) -l$(nproc) check-llvm
diff --git a/lld/wasm/WriterUtils.cpp b/lld/wasm/WriterUtils.cpp
--- a/lld/wasm/WriterUtils.cpp
+++ b/lld/wasm/WriterUtils.cpp
@@ -36,8 +36,6 @@
     return "externref";
   case ValType::EXNREF:
     return "exnref";
-  case ValType::EXTERNREF:
-    return "externref";
   }
   llvm_unreachable("Invalid wasm::ValType");
 }
diff --git a/llvm/include/llvm/BinaryFormat/Wasm.h b/llvm/include/llvm/BinaryFormat/Wasm.h
--- a/llvm/include/llvm/BinaryFormat/Wasm.h
+++ b/llvm/include/llvm/BinaryFormat/Wasm.h
@@ -231,7 +231,6 @@
   WASM_TYPE_F64 = 0x7C,
   WASM_TYPE_V128 = 0x7B,
   WASM_TYPE_FUNCREF = 0x70,
-  WASM_TYPE_EXTERNREF = 0x6F,
   WASM_TYPE_EXNREF = 0x68,
   WASM_TYPE_EXTERNREF = 0x6F,
   WASM_TYPE_FUNC = 0x60,
@@ -365,7 +364,6 @@
   FUNCREF = WASM_TYPE_FUNCREF,
   EXTERNREF = WASM_TYPE_EXTERNREF,
   EXNREF = WASM_TYPE_EXNREF,
-  EXTERNREF = WASM_TYPE_EXTERNREF,
 };
 
 struct WasmSignature {
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
--- a/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
@@ -816,8 +816,6 @@
       ResultReg = createResultReg(&WebAssembly::EXNREFRegClass);
       break;
     case MVT::externref:
-      Opc = IsDirect ? WebAssembly::CALL_externref
-                     : WebAssembly::PCALL_INDIRECT_externref;
       ResultReg = createResultReg(&WebAssembly::EXTERNREFRegClass);
       break;
     default:
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td
--- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td
@@ -66,10 +66,6 @@
     Predicate<"Subtarget->hasReferenceTypes()">,
     AssemblerPredicate<(all_of FeatureReferenceTypes), "reference-types">;
 
-def HasReferenceTypes :
-    Predicate<"Subtarget->hasReferenceTypes()">,
-    AssemblerPredicate<"FeatureReferenceTypes", "reference-types">;
-
 //===----------------------------------------------------------------------===//
 // WebAssembly-specific DAG Node Types.
 //===----------------------------------------------------------------------===//
diff --git a/llvm/test/CodeGen/WebAssembly/externref.ll b/llvm/test/CodeGen/WebAssembly/externref.ll
--- a/llvm/test/CodeGen/WebAssembly/externref.ll
+++ b/llvm/test/CodeGen/WebAssembly/externref.ll
@@ -9,7 +9,7 @@
 ; CHECK-LABEL: call_test:
 ; CHECK: .functype       call_test (externref) -> (externref)
 define i8 addrspace(256)* @call_test(i8 addrspace(256)*) {
-; CHECK: externref.call     $push0=, test, $0
+; CHECK: call     $push0=, test, $0
   %a = call i8 addrspace(256)* @test(i8 addrspace(256)* %0) 
   ret i8 addrspace(256)* %a
 }