From owner-svn-src-projects@freebsd.org Tue Mar 10 06:49:45 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF53225A5A8 for ; Tue, 10 Mar 2020 06:49:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48c5LK0Tppz4Zks; Tue, 10 Mar 2020 06:49:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D643D1F83F; Tue, 10 Mar 2020 06:49:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02A6nirp037419; Tue, 10 Mar 2020 06:49:44 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02A6niKW037415; Tue, 10 Mar 2020 06:49:44 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202003100649.02A6niKW037415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 10 Mar 2020 06:49:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r358831 - in projects/clang1000-import: lib/clang lib/csu/arm lib/libc++ usr.bin/clang/clang X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang1000-import: lib/clang lib/csu/arm lib/libc++ usr.bin/clang/clang X-SVN-Commit-Revision: 358831 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2020 06:49:46 -0000 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++ \