summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/gdb/Makefile.inc
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2010-11-11 20:52:24 +0000
committerdim <dim@FreeBSD.org>2010-11-11 20:52:24 +0000
commit37e50857240f22fdc2beb83a5bf670c44a94212d (patch)
tree9a6496b320a182a536b4a33b916ab30b48840f06 /gnu/usr.bin/gdb/Makefile.inc
parentcfbe0682af24afabd3a5a9652758cf3ef046843b (diff)
parent56b80da7cac820e4575a4eca93a1c13c386ccec5 (diff)
downloadFreeBSD-src-37e50857240f22fdc2beb83a5bf670c44a94212d.zip
FreeBSD-src-37e50857240f22fdc2beb83a5bf670c44a94212d.tar.gz
Sync: merge r214895 through r215140 from ^/head.
Diffstat (limited to 'gnu/usr.bin/gdb/Makefile.inc')
-rw-r--r--gnu/usr.bin/gdb/Makefile.inc14
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index c230f95..2888163 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -16,8 +16,16 @@ OBJ_ROOT= ${.OBJDIR}/../..
OBJ_BU= ${OBJ_ROOT}/binutils
OBJ_GDB= ${OBJ_ROOT}/gdb
-TARGET_ARCH?= ${MACHINE_ARCH}
-TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH}
+# These assignments duplicate much of the functionality of
+# MACHINE_CPUARCH, but there's no easy way to export make functions...
+
+.if defined(TARGET_ARCH)
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+.else
+TARGET_CPUARCH=${MACHINE_CPUARCH}
+.endif
+TARGET_ARCH?= ${MACHINE_ARCH}
+TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_CPUARCH}
.if ${TARGET_ARCH} != ${MACHINE_ARCH}
GDB_CROSS_DEBUGGER=
@@ -31,7 +39,7 @@ GDB_CROSS_DEBUGGER=
CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1
CFLAGS+= -I.
CFLAGS+= -I${TARGET_SUBDIR}
-CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_ARCH}
+CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_CPUARCH}
CFLAGS+= -I${CNTRB_GDB}/gdb
CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
OpenPOWER on IntegriCloud