]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tools/rv: Keep user LDFLAGS in build
authorTomas Glozar <tglozar@redhat.com>
Tue, 4 Mar 2025 14:22:28 +0000 (15:22 +0100)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Tue, 4 Mar 2025 19:15:46 +0000 (14:15 -0500)
rv, unlike rtla and perf, drops LDFLAGS supplied by the user and honors
only EXTRA_LDFLAGS. This is inconsistent with both perf and rtla and
can lead to all kinds of unexpected behavior.

For example, on Fedora and RHEL, it causes rv to be build without
PIE, unlike the aforementioned perf and rtla:

$ file /usr/bin/{rv,rtla,perf}
/usr/bin/rv:   ELF 64-bit LSB executable, ...
/usr/bin/rtla: ELF 64-bit LSB pie executable, ...
/usr/bin/perf: ELF 64-bit LSB pie executable, ...

Keep both LDFLAGS and EXTRA_LDFLAGS for the build.

Cc: John Kacur <jkacur@redhat.com>
Cc: Luis Goncalves <lgoncalv@redhat.com>
Cc: Gabriele Monaco <gmonaco@redhat.com>
Link: https://lore.kernel.org/20250304142228.767658-1-tglozar@redhat.com
Fixes: 012e4e77df73 ("tools/verification: Use tools/build makefiles on rv")
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
tools/verification/rv/Makefile.rv

index 161baa29eb86c0044cd7211ea3f2948db4e94c99..2497fb96c83d27d88579a012955f6d5d97aae736 100644 (file)
@@ -27,7 +27,7 @@ endif
 
 INCLUDE                := -Iinclude/
 CFLAGS         := -g -DVERSION=\"$(VERSION)\" $(FOPTS) $(WOPTS) $(EXTRA_CFLAGS) $(INCLUDE)
-LDFLAGS                := -ggdb $(EXTRA_LDFLAGS)
+LDFLAGS                := -ggdb $(LDFLAGS) $(EXTRA_LDFLAGS)
 
 INSTALL                := install
 MKDIR          := mkdir