[OB] Fix configure.srv error for Linux on PowerPC

Message ID 20200129175401.19143-1-pedromfc@linux.ibm.com
State New
Headers show
Series
  • [OB] Fix configure.srv error for Linux on PowerPC
Related show

Commit Message

Pedro Franco de Carvalho Jan. 29, 2020, 5:54 p.m.
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  <pedromfc@linux.ibm.com>

	* 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(-)

-- 
2.20.1

Comments

Maciej W. Rozycki Jan. 29, 2020, 6:05 p.m. | #1
On Wed, 29 Jan 2020, Pedro Franco de Carvalho wrote:

> 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.


 Ouch, sorry for the paste thinko and thanks for the fix!

  Maciej
Pedro Franco de Carvalho Jan. 29, 2020, 6:10 p.m. | #2
"Maciej W. Rozycki" <macro@wdc.com> writes:

> On Wed, 29 Jan 2020, Pedro Franco de Carvalho wrote:

>

>> 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.

>

>  Ouch, sorry for the paste thinko and thanks for the fix!

>

>   Maciej


No worries!

I also noticed that the line in configure.srv for i[34567]86-*-mingw*)
is missing a line break, but I don't have a mingw setup to test a fix
and send it.

Thanks!

--
Pedro

Patch

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  <pedromfc@linux.ibm.com>
+
+	* configure.srv (powerpc*-*-linux*): Use srv_tgtobj in second
+	assignment instead of srv_linux_obj.
+
 2020-01-28  Hannes Domani  <ssbssa@yahoo.de>
 
 	* 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"