From 75a3fd557973ca6cbcdbde60ee6a238b72c2d750 Mon Sep 17 00:00:00 2001
From: Peter Griffin <peter.griffin@linaro.org>
Date: Fri, 13 Jan 2017 14:44:35 +0000
Subject: packages/binutils-gdb: Add GDBARCH variable

For aarch64 / arm64 the arch is slightly different between
kernel and GDB. So introduce a separate GDBARCH variable.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 build-common/packages/binutils-gdb | 12 ++++++------
 targets/arm-stm32/config.in        |  1 +
 targets/qemu-arm/config.in         |  1 +
 targets/qemu-arm64/config.in       |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build-common/packages/binutils-gdb b/build-common/packages/binutils-gdb
index c24ca7c..d1e4721 100644
--- a/build-common/packages/binutils-gdb
+++ b/build-common/packages/binutils-gdb
@@ -1,8 +1,8 @@
 ## Build a binutils-gdb package
 
 BINUTILS_SRC?=$(BUILDSYS_SOURCES)/binutils-gdb
-BINUTILS_BUILD=$(BUILDSYS_BUILD)/$(ARCH)/binutils-gdb
-BINUTILS_INSTALL=$(BUILDSYS_INSTALL)/$(ARCH)/binutils-gdb
+BINUTILS_BUILD=$(BUILDSYS_BUILD)/$(GDBARCH)/binutils-gdb
+BINUTILS_INSTALL=$(BUILDSYS_INSTALL)/$(GDBARCH)/binutils-gdb
 
 $(BINUTILS_BUILD) $(BINUTILS_INSTALL):
 	@mkdir -p $@
@@ -31,14 +31,14 @@ binutils-gdb-configure $(BINUTILS_BUILD)/Makefile: | $(BINUTILS_SRC) $(BINUTILS_
 	cd $(BINUTILS_BUILD) && \
 	$(BINUTILS_SRC)/configure \
 		--prefix=/usr \
-		--target=$(ARCH)-linux \
-		--program-prefix=$(ARCH)-linux- \
+		--target=$(GDBARCH)-linux \
+		--program-prefix=$(GDBARCH)-linux- \
 		--disable-nls \
 		--enable-linux-kernel-aware \
 		--enable-shtdi \
 		--enable-tui \
 		--with-python=yes \
-		$(BINUTILS_CONF_EXT_$(ARCH))
+		$(BINUTILS_CONF_EXT_$(GDBARCH))
 
 binutils-gdb-build: $(BINUTILS_BUILD)/Makefile
 	$(MAKE) CFLAGS='-g3 -O0' -j $(J) -C $(BINUTILS_BUILD)
@@ -60,7 +60,7 @@ binutils-gdb-distclean:
 
 ## Helpers to use the built and installed GDB
 
-GDB?=$(shell PATH=$(PATH) which $(ARCH)-linux-gdb)
+GDB?=$(shell PATH=$(PATH) which $(GDBARCH)-linux-gdb)
 
 gdb-version:
 	@echo "Using GDB from : $(GDB)"
diff --git a/targets/arm-stm32/config.in b/targets/arm-stm32/config.in
index b82a2cb..a72ee16 100644
--- a/targets/arm-stm32/config.in
+++ b/targets/arm-stm32/config.in
@@ -1,4 +1,5 @@
 ARCH:=arm
+GDBARCH=arm
 SUBARCH:=armv7
 DEFCONFIG?=stm32_defconfig
 LINUX_DEFAULT_TARGET=xipImage
diff --git a/targets/qemu-arm/config.in b/targets/qemu-arm/config.in
index 24f7ca8..05a950c 100644
--- a/targets/qemu-arm/config.in
+++ b/targets/qemu-arm/config.in
@@ -1,4 +1,5 @@
 ARCH:=arm
+GDBARCH:=arm
 SUBARCH:=armv7
 
 GDB_ARMGDB_OPTS+=-ex 'b internal_error'
diff --git a/targets/qemu-arm64/config.in b/targets/qemu-arm64/config.in
index ed620dd..a204e32 100644
--- a/targets/qemu-arm64/config.in
+++ b/targets/qemu-arm64/config.in
@@ -1,4 +1,5 @@
-ARCH:=aarch64
+ARCH:=arm64
+GDBARCH:=aarch64
 SUBARCH:=armv8
 
 UBUNTUFS_VERSION=vivid
-- 
cgit v1.2.3