Index: llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.ml
===================================================================
--- llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.ml
+++ llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.ml
@@ -7,9 +7,6 @@
  *
  *===----------------------------------------------------------------------===*)
 
-external add_bb_vectorize
-  : [<Llvm.PassManager.any] Llvm.PassManager.t -> unit
-  = "llvm_add_bb_vectorize"
 external add_loop_vectorize
   : [<Llvm.PassManager.any] Llvm.PassManager.t -> unit
   = "llvm_add_loop_vectorize"
Index: llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.mli
===================================================================
--- llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.mli
+++ llvm/trunk/bindings/ocaml/transforms/vectorize/llvm_vectorize.mli
@@ -12,11 +12,6 @@
     This interface provides an OCaml API for LLVM vectorize transforms, the
     classes in the [LLVMVectorize] library. *)
 
-(** See the [llvm::createBBVectorizePass] function. *)
-external add_bb_vectorize
-  : [<Llvm.PassManager.any] Llvm.PassManager.t -> unit
-  = "llvm_add_bb_vectorize"
-
 (** See the [llvm::createLoopVectorizePass] function. *)
 external add_loop_vectorize
   : [<Llvm.PassManager.any] Llvm.PassManager.t -> unit
Index: llvm/trunk/bindings/ocaml/transforms/vectorize/vectorize_ocaml.c
===================================================================
--- llvm/trunk/bindings/ocaml/transforms/vectorize/vectorize_ocaml.c
+++ llvm/trunk/bindings/ocaml/transforms/vectorize/vectorize_ocaml.c
@@ -20,12 +20,6 @@
 #include "caml/misc.h"
 
 /* [<Llvm.PassManager.any] Llvm.PassManager.t -> unit */
-CAMLprim value llvm_add_bb_vectorize(LLVMPassManagerRef PM) {
-  LLVMAddBBVectorizePass(PM);
-  return Val_unit;
-}
-
-/* [<Llvm.PassManager.any] Llvm.PassManager.t -> unit */
 CAMLprim value llvm_add_loop_vectorize(LLVMPassManagerRef PM) {
   LLVMAddLoopVectorizePass(PM);
   return Val_unit;
Index: llvm/trunk/docs/ReleaseNotes.rst
===================================================================
--- llvm/trunk/docs/ReleaseNotes.rst
+++ llvm/trunk/docs/ReleaseNotes.rst
@@ -146,13 +146,15 @@
 Changes to the OCaml bindings
 -----------------------------
 
- During this release ...
+* Remove ``add_bb_vectorize``.
 
 
 Changes to the C API
 --------------------
 
- During this release ...
+* Remove ``LLVMAddBBVectorizePass``. The implementation was removed and the C
+  interface was made a deprecated no-op in LLVM 5. Use
+  ``LLVMAddSLPVectorizePass`` instead to get the supported SLP vectorizer.
 
 
 External Open Source Projects Using LLVM 7
Index: llvm/trunk/include/llvm-c/Transforms/Vectorize.h
===================================================================
--- llvm/trunk/include/llvm-c/Transforms/Vectorize.h
+++ llvm/trunk/include/llvm-c/Transforms/Vectorize.h
@@ -33,9 +33,6 @@
  * @{
  */
 
-/** DEPRECATED - Use LLVMAddSLPVectorizePass */
-void LLVMAddBBVectorizePass(LLVMPassManagerRef PM);
-
 /** See llvm::createLoopVectorizePass function. */
 void LLVMAddLoopVectorizePass(LLVMPassManagerRef PM);
 
Index: llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp
+++ llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp
@@ -34,10 +34,6 @@
   initializeVectorization(*unwrap(R));
 }
 
-// DEPRECATED: Remove after the LLVM 5 release.
-void LLVMAddBBVectorizePass(LLVMPassManagerRef PM) {
-}
-
 void LLVMAddLoopVectorizePass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createLoopVectorizePass());
 }
Index: llvm/trunk/test/Bindings/OCaml/vectorize.ml
===================================================================
--- llvm/trunk/test/Bindings/OCaml/vectorize.ml
+++ llvm/trunk/test/Bindings/OCaml/vectorize.ml
@@ -42,7 +42,6 @@
   ignore (build_ret_void (builder_at_end context (entry_block fn)));
 
   ignore (PassManager.create ()
-           ++ add_bb_vectorize
            ++ add_loop_vectorize
            ++ add_slp_vectorize
            ++ PassManager.run_module m