Merge pull request #78 from riscv/build32

timsifive · web-flow · commit 29b62710f7b5 · 2017-07-06T15:03:12.000-07:00
Add 32-bit build
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,18 @@
 language: c
 dist: trusty
 
+matrix:
+    include:
+        - os: linux
+          env: BUILD=x86_64-linux-gnu
+
+        - os: linux
+          env: BUILD=i686-linux-gnu CFLAGS=-m32
+          addons:
+              apt:
+                  packages:
+                      - gcc-multilib
+
 script:
     - ./bootstrap && ./configure && make
+    - file src/openocd
diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h
@@ -114,7 +114,7 @@ int mips32_cp0_read(struct mips_ejtag *ejtag_info,
 int mips32_cp0_write(struct mips_ejtag *ejtag_info,
 		uint32_t val, uint32_t cp0_reg, uint32_t cp0_sel);
 
-inline void pracc_swap16_array(struct mips_ejtag *ejtag_info, uint32_t *buf, int count)
+static inline void pracc_swap16_array(struct mips_ejtag *ejtag_info, uint32_t *buf, int count)
 {
 	if (ejtag_info->isa && ejtag_info->endianness)
 		for (int i = 0; i != count; i++)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ int mips32_cp0_read(struct mips_ejtag *ejtag_info,`
`114`	`114`	`int mips32_cp0_write(struct mips_ejtag *ejtag_info,`
`115`	`115`	`uint32_t val, uint32_t cp0_reg, uint32_t cp0_sel);`
`116`	`116`
`117`		`-inline void pracc_swap16_array(struct mips_ejtag ejtag_info, uint32_t buf, int count)`
	`117`	`+static inline void pracc_swap16_array(struct mips_ejtag ejtag_info, uint32_t buf, int count)`
`118`	`118`	`{`
`119`	`119`	`if (ejtag_info->isa && ejtag_info->endianness)`
`120`	`120`	`for (int i = 0; i != count; i++)`