From patchwork Sun Dec 12 00:11:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 48838 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 3C9123857C7C for ; Sun, 12 Dec 2021 00:12:04 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 844B63858D39 for ; Sun, 12 Dec 2021 00:11:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 844B63858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A330028B; Sun, 12 Dec 2021 01:11:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8vV-jsbtv1Xj; Sun, 12 Dec 2021 01:11:46 +0100 (CET) Received: from begin (unknown [IPv6:2a01:cb19:956:1b00:de41:a9ff:fe47:ec49]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9B9E61B8; Sun, 12 Dec 2021 01:11:46 +0100 (CET) Received: from samy by begin with local (Exim 4.95) (envelope-from ) id 1mwCSv-001qoX-N7; Sun, 12 Dec 2021 01:11:45 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [hurd,commited] hurd: Fix gmon-static Date: Sun, 12 Dec 2021 01:11:45 +0100 Message-Id: <20211212001145.441338-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Spamd-Bar: ++++ X-Rspamd-Server: hera Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Queue-Id: A330028B X-Spamd-Result: default: False [4.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; MID_CONTAINS_FROM(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[] X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" We need to use crt0 for gmon-static too. --- gmon/Makefile | 8 ++++---- sysdeps/mach/hurd/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gmon/Makefile b/gmon/Makefile index 7b7b854327..7d63a9dad8 100644 --- a/gmon/Makefile +++ b/gmon/Makefile @@ -50,14 +50,14 @@ CFLAGS-mcount.c := -fno-omit-frame-pointer CFLAGS-tst-gmon.c := -fno-omit-frame-pointer -pg tst-gmon-no-pie = yes -CRT-tst-gmon := $(csu-objpfx)gcrt1.o +CRT-tst-gmon := $(csu-objpfx)g$(start-installed-name) tst-gmon-ENV := GMON_OUT_PREFIX=$(objpfx)tst-gmon.data ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-gmon-gprof.out endif CFLAGS-tst-gmon-static.c := $(PIE-ccflag) -fno-omit-frame-pointer -pg -CRT-tst-gmon-static := $(csu-objpfx)gcrt1.o +CRT-tst-gmon-static := $(csu-objpfx)g$(static-start-installed-name) tst-gmon-static-no-pie = yes tst-gmon-static-ENV := GMON_OUT_PREFIX=$(objpfx)tst-gmon-static.data ifeq ($(run-built-tests),yes) @@ -65,7 +65,7 @@ tests-special += $(objpfx)tst-gmon-static-gprof.out endif CFLAGS-tst-gmon-pie.c := $(PIE-ccflag) -fno-omit-frame-pointer -pg -CRT-tst-gmon-pie := $(csu-objpfx)gcrt1.o +CRT-tst-gmon-pie := $(csu-objpfx)g$(start-installed-name) tst-gmon-pie-ENV := GMON_OUT_PREFIX=$(objpfx)tst-gmon-pie.data ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-gmon-pie-gprof.out @@ -73,7 +73,7 @@ endif ifeq (yes,$(enable-static-pie)) CFLAGS-tst-gmon-static-pie.c := $(PIE-ccflag) -fno-omit-frame-pointer -pg -CRT-tst-gmon-static-pie := $(csu-objpfx)grcrt1.o +CRT-tst-gmon-static-pie := $(csu-objpfx)gr$(static-start-installed-name) tst-gmon-static-pie-ENV := GMON_OUT_PREFIX=$(objpfx)tst-gmon-static-pie.data ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-gmon-static-pie-gprof.out diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 17bb643c18..393e92210b 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -186,7 +186,7 @@ ifeq ($(subdir),csu) extra-objs += static-start.o # We need special startup code for statically linked binaries. -$(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o +$(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o $(objpfx)static-reloc.o $(link-relocatable) endif