From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id 25ADB3881D1B for ; Wed, 14 Dec 2022 11:43:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 25ADB3881D1B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-x1034.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so6851612pjs.4 for ; Wed, 14 Dec 2022 03:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=LxRJzlZipgphJzfNQaRq5ubaB6ONoj6Yjh65/YAJzZ4=; b=BN3wTstqr45SQt3K8UgKh7ZgDavyrS5UzSp87iMbhGwsVWzJV5fft4hhtqCPEpHins XD6lYgLOyVPTEyHfV+d7DB/QaggcCMu7SB//JZXdjsvE8OmnnCAm/p81b+gZBLEDiYUI A6odzF39n9ucTDvtFgdweJBO1fkE404pjiRrpwSfbQZOY/NcJGTyLJr9KNwHpMNIb0t5 MnYqmUrQboZYbYvkyd5hB3R3OnrjDHPSPKRFLZME3Q00nRcZHJCbkLb9a8SddHqt/VhH feIbP+euOqp70Jw7X9HrYPMDNs/7g2994Ehf19uyJ7dcA6dG5I9XagSzpDL7iNzTN8Y1 MeLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LxRJzlZipgphJzfNQaRq5ubaB6ONoj6Yjh65/YAJzZ4=; b=msJkQfriH0CE0eiI2en3Xcavz4s2b0bhvHlwIyBiHkrZmZ92VWBbl1SYB22alu59vU DjmkMxhnOQHLd+0csxG/Ixd3SyyOXk9a4AAfUK9c3rxMh4qFRCT4EMmIb2gGBxBwL4p6 CNVVy+MU5iNujuecHJd+RJHkyMPw2OnSRwcB4O8eHiIPtnKFfTs0h5HZhwTSFQ37JnKJ qOnHnoSmlsQvJdbS8b5qo29umnSw+f9kRZHHU+4ilyVDuTrQIpJYv4Unoh1dfjVcQUDo eqZ6rU+v7ZlRf94Iw8HEBZdt7g08Qb9MAfktPrYjZ+dRNzIAXecJQGGvWoR/PvXDibPB 4CVA== X-Gm-Message-State: ANoB5plOAl4ojtj7luvme7OmEx79Yk/Kq2E+R/DPbc9YW8PIu1U/qoX9 LVdPanZZNmu7SJLHTEQmRcCde9iMV6M= X-Google-Smtp-Source: AA0mqf5bLNIsHDmkYxOnsAoSRZy3jZMnbu9fWjcWKQw9a6ensVYHvoi9xpOVuNsNYIsoWpI1C7G0Gg== X-Received: by 2002:a05:6a20:43a1:b0:9d:efbe:2063 with SMTP id i33-20020a056a2043a100b0009defbe2063mr33057719pzl.25.1671018191874; Wed, 14 Dec 2022 03:43:11 -0800 (PST) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id q15-20020a170902a3cf00b0016d9b101413sm1664001plb.200.2022.12.14.03.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 03:43:11 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id B363C1141D87; Wed, 14 Dec 2022 22:13:08 +1030 (ACDT) Date: Wed, 14 Dec 2022 22:13:08 +1030 From: Alan Modra To: binutils@sourceware.org Subject: Fix haiku ld dependencies Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3035.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I noticed after commit 8ad93045ed, "ld, gold: remove support for -z bndplt (MPX prefix)", that some of my builds were failing with eelf_x86_64_haiku.c:650:9: error: no member named 'bndplt' in 'struct elf_linker_x86_params' params.bndplt = true; ~~~~~~ ^ * emulparams/aarch64haiku.sh: Use "source_sh" rather than ".". * emulparams/armelf_haiku.sh: Likewise. * emulparams/elf32ppchaiku.sh: Likewise. * emulparams/elf_mipsel_haiku.sh: Likewise. * emulparams/elf_x86_64_haiku.sh: Likewise. diff --git a/ld/emulparams/aarch64haiku.sh b/ld/emulparams/aarch64haiku.sh index b0298ec4d96..73f6a9b742b 100644 --- a/ld/emulparams/aarch64haiku.sh +++ b/ld/emulparams/aarch64haiku.sh @@ -36,4 +36,4 @@ ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.att # Ensure each PLT entry is aligned to a cache line. PLT=".plt ${RELOCATING-0} : ALIGN(16) { *(.plt)${RELOCATING+${IREL_IN_PLT+ *(.iplt)}} }" -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/armelf_haiku.sh b/ld/emulparams/armelf_haiku.sh index 413c06c9d15..0d0e3a3bf75 100644 --- a/ld/emulparams/armelf_haiku.sh +++ b/ld/emulparams/armelf_haiku.sh @@ -30,4 +30,4 @@ TARGET2_TYPE=got-rel # ARM does not support .s* sections. NO_SMALL_DATA=yes -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/elf32ppchaiku.sh b/ld/emulparams/elf32ppchaiku.sh index 547e5c8e669..f4eae4fdbaa 100644 --- a/ld/emulparams/elf32ppchaiku.sh +++ b/ld/emulparams/elf32ppchaiku.sh @@ -1,5 +1,5 @@ -. ${srcdir}/emulparams/elf32ppc.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf32ppc.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh TEXT_START_ADDR=0x200000 MAXPAGESIZE=0x1000 GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/elf_mipsel_haiku.sh b/ld/emulparams/elf_mipsel_haiku.sh index ab38e2323cd..c7e09f37e95 100644 --- a/ld/emulparams/elf_mipsel_haiku.sh +++ b/ld/emulparams/elf_mipsel_haiku.sh @@ -1,3 +1,3 @@ -. ${srcdir}/emulparams/elf32lmip.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf32lmip.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh diff --git a/ld/emulparams/elf_x86_64_haiku.sh b/ld/emulparams/elf_x86_64_haiku.sh index f049559b40f..e6231cdfb15 100644 --- a/ld/emulparams/elf_x86_64_haiku.sh +++ b/ld/emulparams/elf_x86_64_haiku.sh @@ -1,2 +1,2 @@ -. ${srcdir}/emulparams/elf_x86_64.sh -. ${srcdir}/emulparams/elf_haiku.sh +source_sh ${srcdir}/emulparams/elf_x86_64.sh +source_sh ${srcdir}/emulparams/elf_haiku.sh -- Alan Modra Australia Development Lab, IBM