From nobody Wed Dec 22 10:06:05 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 764C61905FF8; Wed, 22 Dec 2021 10:06:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpqz0w0wz4YTW; Wed, 22 Dec 2021 10:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 198B81B268; Wed, 22 Dec 2021 10:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA66pS092234; Wed, 22 Dec 2021 10:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA65bq092233; Wed, 22 Dec 2021 10:06:05 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:05 GMT Message-Id: <202112221006.1BMA65bq092233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: aa3c7e20b986 - stable/12 - Avoid adding duplicates to SRCS/OBJS/SOBJS/POBJS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: aa3c7e20b9862ae39b05b68c42defdf782ae7d44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5JmWcmObQtf3UixSoHjly/rflHkYC4WLbJxTwfJ+xI=; b=uuRvr+7slXCWMI6vKO+DMjPVtPa9gAWTYqJPo16fmG2glsuwhl5NxTkVog1Socugg4rCLW u8oMNghCDEhf6R2w3sVoBR+6A3x0NxoJPnbADlELjPebbI6s5dlkMHKhFwZ1X1jGtzzEVW ut+mp0SD4Xs2ThWNDq/LQw0LNiPiXOlaK9myr97KwB6V5E0/4CtoNv0uBfmBSGKxQlo43f J4Emjx5Tj9yQziz8nkyF3rqpbWhXbzICIVBUyBvglw2jEtrFb73+eDvWmGwwbXtEfn8yuc wH3XYXp+ZZYnzhNl6NYSx1Wte54kwxDqbFJW+qZmwd9e0ZvJt0BxImBU0ENbJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167570; a=rsa-sha256; cv=none; b=Q52L3UV8dc/6StHVy0tkvO8+eDtgOGzMGeIe9WUHeDKvZzFvM/rhbzF5kCdzvEW7FxYRNi DYmQF8rlKHbPLGg3G9xlBdfg+8Xy4cjwbr8v2ADayjjArgoEkZY4xsVkJwMbNgpeVeeaVo 8QOluD9s+4btiiftxqbpk8e+Y5qf2wWVykWGkqtYss5ZpYsSnppRKNgRieNP0WeXjcQjIJ QAFfA5tAbkiTmofl3+Vq7LcnW5yjOPlS1xSDAR18dxxWM3M1wUkaeNwVPeG9LSu0pPFd3k CI3LX5wVDkzGMWlxDv5LYY1qJ8sgApEqN1Ch5tDBApXGKcuG07tHqkiEOIXZXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aa3c7e20b9862ae39b05b68c42defdf782ae7d44 commit aa3c7e20b9862ae39b05b68c42defdf782ae7d44 Author: Alex Richardson AuthorDate: 2020-08-24 09:20:33 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:34 +0000 Avoid adding duplicates to SRCS/OBJS/SOBJS/POBJS This is a change in preparation for stopping to use lorder.sh (D26044) and instead assume that we have a linker newer than ~1990. Without lorder.sh duplicates end up being passed to the linker when building .so files and this can result in duplicate symbol definition errors. There is one minor change: libcompiler_rt.a will no longer provide gcc_personality_v0 and instead we now only have it in libgcc_eh.a/libgcc_s.so. This matches GCC's behaviour. Reviewed By: emaste, cem Differential Revision: https://reviews.freebsd.org/D26042 (cherry picked from commit 0b862b03998a292a18bcc7f9ac5b05c0303c5de3) --- lib/libcompiler_rt/Makefile.inc | 1 - lib/libgcc_eh/Makefile | 1 + lib/libgcc_eh/Makefile.inc | 1 - lib/libprocstat/Makefile | 2 -- stand/userboot/userboot/Makefile | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 8b9a009a91e9..5766e835ea38 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -69,7 +69,6 @@ SRCF+= floatunsisf SRCF+= floatuntidf SRCF+= floatuntisf SRCF+= floatuntixf -SRCF+= gcc_personality_v0 # not in upstream SRCF+= int_util SRCF+= lshrdi3 SRCF+= lshrti3 diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile index bf018e16c9e0..ecffbf9cfd6a 100644 --- a/lib/libgcc_eh/Makefile +++ b/lib/libgcc_eh/Makefile @@ -8,6 +8,7 @@ NO_PIC= MK_SSP= no WARNS?= 2 +SRCS_EXC+= int_util.c .include "Makefile.inc" .if ${.MAKE.LEVEL} > 0 diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 9925d156fb04..6e025921180a 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -9,7 +9,6 @@ STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN .PATH: ${COMPILERRTDIR}/lib/builtins .PATH: ${UNWINDSRCDIR} SRCS_EXC+= gcc_personality_v0.c -SRCS_EXC+= int_util.c SRCS_EXC+= Unwind-EHABI.cpp SRCS_EXC+= Unwind-sjlj.c SRCS_EXC+= UnwindLevel1-gcc-ext.c diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index cedfed27fda1..30e68ffb7352 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -63,8 +63,6 @@ MLINKS+=libprocstat.3 procstat_close.3 \ CFLAGS+= -DLIBPROCSTAT_ZFS SRCS+= zfs.c OBJS+= zfs/zfs_defs.o -SOBJS+= zfs/zfs_defs.pico -POBJS+= zfs/zfs_defs.po SUBDIR= zfs zfs/zfs_defs.o: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 7a5462bf2723..a6e884be1040 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -20,7 +20,6 @@ SRCS+= bootinfo.c SRCS+= bootinfo32.c SRCS+= bootinfo64.c SRCS+= conf.c -SRCS+= console.c SRCS+= copy.c SRCS+= devicename.c SRCS+= elf32_freebsd.c