Re: [PATCH] Require GNU make 3.82

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On 7/18/19 12:57 PM, Alan Hayward wrote:
> 
> 
>> On 18 Jul 2019, at 07:17, Eli Zaretskii <eliz@gnu.org> wrote:
>>
>>> From: Alan Hayward <Alan.Hayward@arm.com>
>>> CC: nd <nd@arm.com>, Alan Hayward <Alan.Hayward@arm.com>
>>> Date: Mon, 15 Jul 2019 10:11:29 +0000
>>>
>>> Gdbserver has failed to build with GNU make 3.81 since commit 08f10e02be.
>>
>> Which feature of Make 3.82 and later is required to successfully
>> build gdbserver?
>>
> 
> It’s not a specific feature in 3.82 that is required.
> 
> It looks like it is a bug in 3.81. The GDB makefile isn’t doing anything special
> and everything works using 3.82 upwards.
> 
> Rewriting the makefile to work around the issue is probably going to be a little
> messy.
> 

This patch (on top of gdb 9.1) works around the issue for make 3.81.

Build with make 3.81 and make 4.2.1 on x86_64-linux.

Thanks,
- Tom

[-- Attachment #2: 0001-gdbserver-Fix-build-with-make-3.81.patch --]
[-- Type: text/x-patch, Size: 802 bytes --]

[gdbserver] Fix build with make 3.81

---
 gdb/gdbserver/Makefile.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 16a9f2fd38..687bee2658 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -580,9 +580,22 @@ ax.o: ax.c
 	$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
 	$(POSTCOMPILE)
 
+ifeq ($(WORKAROUND_ALLOC_IPA),)
+ifeq ($(MAKE_VERSION),3.81)
+WORKAROUND_ALLOC_IPA = 1
+else
+WORKAROUND_ALLOC_IPA = 0
+endif
+endif
+
+ifeq ($(WORKAROUND_ALLOC_IPA),0)
 alloc-ipa.o: ../alloc.c
 	$(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
 	$(POSTCOMPILE)
+else
+alloc-ipa.o: ../alloc.c
+	@$(MAKE) $(FLAGS_TO_PASS) WORKAROUND_ALLOC_IPA=0 alloc-ipa.o
+endif
 
 # Rules for objects that go in the in-process agent.