From owner-svn-src-all@freebsd.org Thu Aug 15 17:35:25 2019 Return-Path: Delivered-To: svn-src-all@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 78BFBB04AA; Thu, 15 Aug 2019 17:35:25 +0000 (UTC) (envelope-from kevans@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 468YWK2c1jz48wf; Thu, 15 Aug 2019 17:35:25 +0000 (UTC) (envelope-from kevans@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 3BF251C082; Thu, 15 Aug 2019 17:35:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7FHZPxp047871; Thu, 15 Aug 2019 17:35:25 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7FHZP0I047870; Thu, 15 Aug 2019 17:35:25 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201908151735.x7FHZP0I047870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 15 Aug 2019 17:35:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351093 - head/libexec/rtld-elf/rtld-libc X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/libexec/rtld-elf/rtld-libc X-SVN-Commit-Revision: 351093 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2019 17:35:25 -0000 Author: kevans Date: Thu Aug 15 17:35:24 2019 New Revision: 351093 URL: https://svnweb.freebsd.org/changeset/base/351093 Log: rtld-elf: fix build with xtoolchain-llvm90 strstr ends up using bcmp when compiled with llvm90; pull it in from libc as well. MFC after: 3 days Modified: head/libexec/rtld-elf/rtld-libc/Makefile.inc Modified: head/libexec/rtld-elf/rtld-libc/Makefile.inc ============================================================================== --- head/libexec/rtld-elf/rtld-libc/Makefile.inc Thu Aug 15 17:32:39 2019 (r351092) +++ head/libexec/rtld-elf/rtld-libc/Makefile.inc Thu Aug 15 17:35:24 2019 (r351093) @@ -40,7 +40,7 @@ CFLAGS.errlst.c+=-I${LIBC_SRCTOP}/include # Use the string and memory .o files from libc instead of rebuilding them (they # might be using optimized assembly and duplicating that logic here is awkward). -_libc_string_objects= bcopy memchr memcmp memcpy memmove stpncpy strcat \ +_libc_string_objects= bcmp bcopy memchr memcmp memcpy memmove stpncpy strcat \ strchr strcmp stpcpy strcpy strcspn strdup strlcat strlcpy strlen strncmp \ strncpy strrchr strsep strspn strstr strtok # Also use all the syscall .o files from libc_nossp_pic: