From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id E50583829BD4; Sun, 29 May 2022 19:08:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E50583829BD4 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10786] Darwin : Adjust defaults for the linker. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 1f459833392b4520d5edfeeadd33150b71061b7a X-Git-Newrev: 90ac2b396d5a4f15a9ab50464f67ab5f08e73b28 Message-Id: <20220529190809.E50583829BD4@sourceware.org> Date: Sun, 29 May 2022 19:08:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2022 19:08:10 -0000 https://gcc.gnu.org/g:90ac2b396d5a4f15a9ab50464f67ab5f08e73b28 commit r10-10786-g90ac2b396d5a4f15a9ab50464f67ab5f08e73b28 Author: Iain Sandoe Date: Thu Dec 31 14:51:56 2020 +0000 Darwin : Adjust defaults for the linker. Ideally, the linker will be queried for its version and that will be used to determine capabilities that cannot be discovered from reasonable configuration testing. When building cross tools, this might not be possible, and we have strategies for providing useful defaults. These are adjusted here to refect current choices. gcc/ChangeLog: * config/darwin.h (MIN_LD64_NO_COAL_SECTS): Adjust. Amend handling for LD64_VERSION fallback defaults. (cherry picked from commit ef370f933c03b95ff0e8ae86b3422d26fc5c49c6) Diff: --- gcc/config/darwin.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 4153bbee1aa..d3ed5ca072a 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -1094,16 +1094,20 @@ extern void darwin_driver_init (unsigned int *,struct cl_decoded_option **); /* Later versions of ld64 support coalescing weak code/data without requiring that they be placed in specially identified sections. This is the earliest _tested_ version known to support this so far. */ -#define MIN_LD64_NO_COAL_SECTS "236.4" +#define MIN_LD64_NO_COAL_SECTS "236.3" /* From at least version 62.1, ld64 can build symbol indirection stubs as needed, and there is no need for the compiler to emit them. */ #define MIN_LD64_OMIT_STUBS "62.1" +/* If we have no definition for the linker version, pick the minimum version + that will bootstrap the compiler. */ #ifndef LD64_VERSION -#define LD64_VERSION "62.1" -#else -#define DEF_LD64 LD64_VERSION +# ifndef DEF_LD64 +# define LD64_VERSION "85.2.1" +# else +# define LD64_VERSION DEF_LD64 +# endif #endif #endif /* CONFIG_DARWIN_H */