diff mbox series

[hurd,commited] hurd: Fix gmon-static

Message ID 20211212001145.441338-1-samuel.thibault@ens-lyon.org
State Committed
Commit 26803075e4e7c0468965ed0d037345288aae99de
Headers show
Series [hurd,commited] hurd: Fix gmon-static | expand

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Samuel Thibault Dec. 12, 2021, 12:11 a.m. UTC
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 mbox series

Patch

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