From 548a204f7d6a7442d940c0afe778f553ec53427f Mon Sep 17 00:00:00 2001 From: Pedro Franco de Carvalho Date: Wed, 29 Jan 2020 14:42:40 -0300 Subject: [PATCH] Fix configure.srv error for Linux on PowerPC An error in commit 42cd72aa0279520384327a1f6d0ebd2eb2200645 caused srv_tgtobj to be overwritten and linux-ppc-low.o to be missed when linking gdbserver for Linux on PowerPC. This patch fixes the error. gdb/gdbserver/ChangeLog: 2020-01-29 Pedro Franco de Carvalho * configure.srv (powerpc*-*-linux*): Use srv_tgtobj in second assignment instead of srv_linux_obj. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/configure.srv | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index a97e408202..3b88a9b901 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-01-29 Pedro Franco de Carvalho + + * configure.srv (powerpc*-*-linux*): Use srv_tgtobj in second + assignment instead of srv_linux_obj. + 2020-01-28 Hannes Domani * server.c (handle_qxfer_libraries): Write segment-address with diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 8437c1ace0..f0ab14f7c3 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -211,7 +211,7 @@ case "${target}" in srv_regobj="${srv_regobj} powerpc-isa207-vsx64l.o" srv_regobj="${srv_regobj} powerpc-isa207-htm-vsx64l.o" srv_tgtobj="$srv_linux_obj linux-ppc-low.o" - srv_tgtobj="$srv_linux_obj nat/ppc-linux.o" + srv_tgtobj="${srv_tgtobj} nat/ppc-linux.o" srv_tgtobj="${srv_tgtobj} arch/ppc-linux-common.o" srv_xmlfiles="rs6000/powerpc-32l.xml" srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec32l.xml" -- 2.34.1