svn commit: r358831 - in projects/clang1000-import: lib/clang lib/csu/arm lib/libc++ usr.bin/clang/clang

[Dimitry Andric]

Author: dim
Date: Tue Mar 10 06:49:43 2020
New Revision: 358831
URL: https://svnweb.freebsd.org/changeset/base/358831

Log:
  Remove -mlong-calls vhen building arm libraries and llvm.
  
  Clang from 9.0.0 onwards already has the necessary relocation range
  extenders, so this workaround is no longer needed (it produces longer
  and slower code). Tested on real hardware, and in cross-compile
  environment.
  
  Submitted by:	mmel

Modified:
  projects/clang1000-import/lib/clang/llvm.build.mk
  projects/clang1000-import/lib/csu/arm/Makefile
  projects/clang1000-import/lib/libc++/Makefile
  projects/clang1000-import/usr.bin/clang/clang/Makefile

Modified: projects/clang1000-import/lib/clang/llvm.build.mk
==============================================================================
--- projects/clang1000-import/lib/clang/llvm.build.mk	Tue Mar 10 06:29:59 2020	(r358830)
+++ projects/clang1000-import/lib/clang/llvm.build.mk	Tue Mar 10 06:49:43 2020	(r358831)
@@ -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

Modified: projects/clang1000-import/lib/csu/arm/Makefile
==============================================================================
--- projects/clang1000-import/lib/csu/arm/Makefile	Tue Mar 10 06:29:59 2020	(r358830)
+++ projects/clang1000-import/lib/csu/arm/Makefile	Tue Mar 10 06:49:43 2020	(r358831)
@@ -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}

Modified: projects/clang1000-import/lib/libc++/Makefile
==============================================================================
--- projects/clang1000-import/lib/libc++/Makefile	Tue Mar 10 06:29:59 2020	(r358830)
+++ projects/clang1000-import/lib/libc++/Makefile	Tue Mar 10 06:49:43 2020	(r358831)
@@ -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}
 

Modified: projects/clang1000-import/usr.bin/clang/clang/Makefile
==============================================================================
--- projects/clang1000-import/usr.bin/clang/clang/Makefile	Tue Mar 10 06:29:59 2020	(r358830)
+++ projects/clang1000-import/usr.bin/clang/clang/Makefile	Tue Mar 10 06:49:43 2020	(r358831)
@@ -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++ \