From cf895486b62bd65e216f771c37f7de3f8a1b7889 Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Mon, 19 Feb 2018 14:25:48 -0800
Subject: [PATCH 1/2] Add a build with --disable_target64

Change-Id: Ibe52a678ab7b8145ffaa54dce38149aa95bdb48c
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 35bf8c435..37a599339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ matrix:
           env:
               - BUILD=i686-linux-gnu
               - CFLAGS=-m32
+              - CONFIGURE_ARGS="--disable-target64"
               - EXECUTABLE=openocd
           compiler: clang
           addons:

From 6b02ab4196d4e2ce64e8f14be053ca7200591afd Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Mon, 19 Feb 2018 15:07:10 -0800
Subject: [PATCH 2/2] Fix build with --disable-target64

Change-Id: I5acf47845ff197a1aeb31356de7e4cd8ce63d476
---
 src/target/mips_m4k.c        | 4 ++--
 src/target/riscv/riscv-013.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 7d1c06cf0..78718ca16 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -702,7 +702,7 @@ static int mips_m4k_set_breakpoint(struct target *target,
 			}
 
 			if (verify == 0) {
-				LOG_ERROR("Unable to set 32bit breakpoint at address %08" PRIx64
+				LOG_ERROR("Unable to set 32bit breakpoint at address %08" TARGET_PRIxADDR
 					" - check that memory is read/writable", breakpoint->address);
 				return ERROR_OK;
 			}
@@ -723,7 +723,7 @@ static int mips_m4k_set_breakpoint(struct target *target,
 				return retval;
 
 			if (verify != MIPS16_SDBBP(isa_req)) {
-				LOG_ERROR("Unable to set 16bit breakpoint at address %08" PRIx64
+				LOG_ERROR("Unable to set 16bit breakpoint at address %08" TARGET_PRIxADDR
 						" - check that memory is read/writable", breakpoint->address);
 				return ERROR_OK;
 			}
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index e136c98be..3831bb2bb 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -777,12 +777,12 @@ static int examine_progbuf(struct target *target)
 
 	uint32_t written = dmi_read(target, DMI_PROGBUF0);
 	if (written == (uint32_t) info->progbuf_address) {
-		LOG_INFO("progbuf is writable at 0x%" TARGET_PRIxADDR,
+		LOG_INFO("progbuf is writable at 0x%" PRIx64,
 				info->progbuf_address);
 		info->progbuf_writable = YNM_YES;
 
 	} else {
-		LOG_INFO("progbuf is not writeable at 0x%" TARGET_PRIxADDR,
+		LOG_INFO("progbuf is not writeable at 0x%" PRIx64,
 				info->progbuf_address);
 		info->progbuf_writable = YNM_NO;
 	}
@@ -1535,8 +1535,8 @@ static int read_memory(struct target *target, target_addr_t address,
 		 * dm_data0 contains mem[s0 - 2*size]
 		 * s1 contains mem[s0-size] */
 
-		LOG_DEBUG("creating burst to read from 0x%" TARGET_PRIxADDR
-				" up to 0x%" TARGET_PRIxADDR, read_addr, fin_addr);
+		LOG_DEBUG("creating burst to read from 0x%" PRIx64
+				" up to 0x%" PRIx64, read_addr, fin_addr);
 		assert(read_addr >= address && read_addr < fin_addr);
 		struct riscv_batch *batch = riscv_batch_alloc(target, 32,
 				info->dmi_busy_delay + info->ac_busy_delay);