From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <maskray@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7814)
 id 904773857418; Tue,  3 May 2022 04:01:52 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 904773857418
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Fangrui Song <maskray@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/google/grte/v5-2.27/master] Makeconfig: Update
 clang_rt.crtbegin.o filename
X-Act-Checkin: glibc
X-Git-Author: Fangrui Song <maskray@google.com>
X-Git-Refname: refs/heads/google/grte/v5-2.27/master
X-Git-Oldrev: 15c4b8cbcc596700c64deb4047a3ba7f4df7da1b
X-Git-Newrev: 20f6c924222f2677d9a53fa3b6c1ea76a1341840
Message-Id: <20220503040152.904773857418@sourceware.org>
Date: Tue,  3 May 2022 04:01:52 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2022 04:01:52 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=20f6c924222f2677d9a53fa3b6c1ea76a1341840

commit 20f6c924222f2677d9a53fa3b6c1ea76a1341840
Author: Fangrui Song <maskray@google.com>
Date:   Mon May 2 21:01:43 2022 -0700

    Makeconfig: Update clang_rt.crtbegin.o filename

Diff:
---
 Makeconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makeconfig b/Makeconfig
index c1a395a105..fea770fec4 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -662,11 +662,10 @@ endif
 +preinit = $(addprefix $(csu-objpfx),crti.o)
 +postinit = $(addprefix $(csu-objpfx),crtn.o)
 ifeq ($(with-clang),yes)
-# With clang, use the crt*.o files from llvm's compiler-rt package.
-# The files normally have an architecture name appended, in case of
-# variants (32/64, le/be etc) installed in the same directory.
-+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=clang_rt.crtbegin-$(config-machine).o`
-+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=clang_rt.crtend-$(config-machine).o`
+# With clang, use the clang_rt.crt*.o files from the compiler-rt package
+# in a LLVM_ENABLE_RUNTIMES build.
++prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=clang_rt.crtbegin.o`
++postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=clang_rt.crtend.o`
 else
 +prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
 +postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`