diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 17c38b04b3bd..a7b46fc5a59d 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -110,8 +110,3 @@ CXXSTD?=	c++14
 CXXFLAGS+=	-fno-exceptions
 CXXFLAGS+=	-fno-rtti
 CXXFLAGS.clang+= -stdlib=libc++
-
-.if ${MACHINE_CPUARCH} == "arm"
-STATIC_CFLAGS+= -mlong-calls
-STATIC_CXXFLAGS+= -mlong-calls
-.endif
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index 8a251f8ca09e..0ed077e635ad 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -8,7 +8,6 @@ OBJS+=		Scrt1.o gcrt1.o
 CFLAGS+=	-I${.CURDIR:H}/common \
 		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
-STATIC_CFLAGS+=	-mlong-calls
 
 FILES=		${OBJS}
 FILESMODE=	${LIBMODE}
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index c7a207a78b28..9e4ccbeb6dc7 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -7,9 +7,6 @@ _LIBCXXRTDIR=	${SRCTOP}/contrib/libcxxrt
 HDRDIR=		${SRCTOP}/contrib/llvm-project/libcxx/include
 SRCDIR=		${SRCTOP}/contrib/llvm-project/libcxx/src
 CXXINCLUDEDIR=	${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
-.if ${MACHINE_CPUARCH} == "arm"
-STATIC_CXXFLAGS+= -mlong-calls
-.endif
 
 .PATH: ${SRCDIR}
 
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 8dab2301cbc4..ec42fe78cf90 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -13,9 +13,6 @@ SRCS+=		driver.cpp
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
 
-.if ${MACHINE_CPUARCH} == "arm"
-CFLAGS+= -mlong-calls
-.endif
 .endif
 
 LINKS=	${BINDIR}/clang ${BINDIR}/clang++ \