From patchwork Tue Jan 12 12:02:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 41694 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C9C83893667; Tue, 12 Jan 2021 12:03:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C9C83893667 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1610452987; bh=YdZuf7G2jViJsd+PhIGLydsVk0Ucovju4IrwUsgU4GY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=pPuTdyn+Estuign26NE34tFuU/AHB4b1jhehDej24D7e2sQGbps5qncdLZCp8OyQo jrszDQdi65UtgZiQDa9xIWjfrzVmw5Gaj9xY8b9U+PGwDx/1lNV+5TksMJG9NB4sVh /1O6/lp6WJwXJS1gKeVaGAE+JxEFL+hC+dwgEqMs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 710C4389364D for ; Tue, 12 Jan 2021 12:03:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 710C4389364D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-325-JdnVUkNHOI6nWrEBndlvag-1; Tue, 12 Jan 2021 07:03:01 -0500 X-MC-Unique: JdnVUkNHOI6nWrEBndlvag-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF32E1005E42; Tue, 12 Jan 2021 12:02:59 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-114-67.ams2.redhat.com [10.36.114.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC6295D9D2; Tue, 12 Jan 2021 12:02:58 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Makerules: Do not require startup files for format.lds probe object Date: Tue, 12 Jan 2021 13:02:57 +0100 Message-ID: <871reqjrbi.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: Andreas Schwab , Fangrui Song Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" During statically linked bootstrap, the compiler does not have the required startup files, so do a smaller dummy link to obtain the output format information. Fixes commit 87d583c6e8cd0e49f64da76636ebeec033298b4d ("install: Replace scripts/output-format.sed with objdump -f [BZ #26559]"). Testing is still in progress, but looks good so far. --- Makerules | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makerules b/Makerules index 06c7c48310..ca9885436e 100644 --- a/Makerules +++ b/Makerules @@ -1067,9 +1067,8 @@ install: $(inst_slibdir)/libc.so$(libc.so-version) # used by a link for a different format on a multi-architecture system. $(common-objpfx)format.lds: $(common-objpfx)config.make \ $(common-objpfx)config.h $(..)Makerules - $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ - $(LDFLAGS.so) $(LDFLAGS-lib.so) \ - -x c /dev/null -o $@.so 2>/dev/null + $(LINK.o) -shared -nostdlib -nostartfiles \ + -x assembler /dev/null -o $@.so $(OBJDUMP) -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@ rm -f $@.so common-generated += format.lds