diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
--- a/llvm/include/llvm/Support/MathExtras.h
+++ b/llvm/include/llvm/Support/MathExtras.h
@@ -457,13 +457,6 @@
   return A + 1;
 }
 
-/// Returns the power of two which is less than or equal to the given value.
-/// Essentially, it is a floor operation across the domain of powers of two.
-LLVM_DEPRECATED("use llvm::bit_floor instead", "llvm::bit_floor")
-inline uint64_t PowerOf2Floor(uint64_t A) {
-  return llvm::bit_floor(A);
-}
-
 /// Returns the power of two which is greater than or equal to the given value.
 /// Essentially, it is a ceil operation across the domain of powers of two.
 inline uint64_t PowerOf2Ceil(uint64_t A) {
diff --git a/llvm/include/llvm/Support/SwapByteOrder.h b/llvm/include/llvm/Support/SwapByteOrder.h
--- a/llvm/include/llvm/Support/SwapByteOrder.h
+++ b/llvm/include/llvm/Support/SwapByteOrder.h
@@ -46,19 +46,6 @@
 
 namespace llvm {
 
-/// ByteSwap_16 - This function returns a byte-swapped representation of
-/// the 16-bit argument.
-LLVM_DEPRECATED("use llvm::byteswap instead", "llvm::byteswap")
-inline uint16_t ByteSwap_16(uint16_t value) { return llvm::byteswap(value); }
-
-/// This function returns a byte-swapped representation of the 32-bit argument.
-LLVM_DEPRECATED("use llvm::byteswap instead", "llvm::byteswap")
-inline uint32_t ByteSwap_32(uint32_t value) { return llvm::byteswap(value); }
-
-/// This function returns a byte-swapped representation of the 64-bit argument.
-LLVM_DEPRECATED("use llvm::byteswap instead", "llvm::byteswap")
-inline uint64_t ByteSwap_64(uint64_t value) { return llvm::byteswap(value); }
-
 namespace sys {
 
 #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN