diff --git a/Makefile b/Makefile
index 8afb2b3..aa9063d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-RISCV_GNU_TOOLCHAIN_GIT_REVISION = 34e199d
+RISCV_GNU_TOOLCHAIN_GIT_REVISION = 914224e
 RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX = /opt/riscv32
 
 SHELL = bash
@@ -107,7 +107,6 @@ build-$(1)-tools-bh:
 	git submodule update --init $$$$reference_riscv_gcc riscv-gcc; \
 	git submodule update --init $$$$reference_riscv_glibc riscv-glibc; \
 	git submodule update --init $$$$reference_riscv_newlib riscv-newlib; \
-	cd riscv-binutils-gdb; git -c user.email="none" -c user.name="none" cherry-pick a5971eca338; cd ..; \
 	mkdir build; cd build; ../configure --with-arch=$(2) --prefix=$(RISCV_GNU_TOOLCHAIN_INSTALL_PREFIX)$(subst riscv32,,$(1)); make
 
 .PHONY: build-$(1)-tools
diff --git a/tests/div.S b/tests/div.S
index a4504a7..24dc9ff 100644
--- a/tests/div.S
+++ b/tests/div.S
@@ -22,10 +22,10 @@ RVTEST_CODE_BEGIN
   TEST_RR_OP( 4, div, -3,  20,  -6 );
   TEST_RR_OP( 5, div,  3, -20,  -6 );
 
-  TEST_RR_OP( 6, div, -1<<63, -1<<63,  1 );
-  TEST_RR_OP( 7, div, -1<<63, -1<<63, -1 );
+  TEST_RR_OP( 6, div, -1<<31, -1<<31,  1 );
+  TEST_RR_OP( 7, div, -1<<31, -1<<31, -1 );
 
-  TEST_RR_OP( 8, div, -1, -1<<63, 0 );
+  TEST_RR_OP( 8, div, -1, -1<<31, 0 );
   TEST_RR_OP( 9, div, -1,      1, 0 );
   TEST_RR_OP(10, div, -1,      0, 0 );
 
diff --git a/tests/rem.S b/tests/rem.S
index c318e2c..7955736 100644
--- a/tests/rem.S
+++ b/tests/rem.S
@@ -22,10 +22,10 @@ RVTEST_CODE_BEGIN
   TEST_RR_OP( 4, rem,  2,  20,  -6 );
   TEST_RR_OP( 5, rem, -2, -20,  -6 );
 
-  TEST_RR_OP( 6, rem,  0, -1<<63,  1 );
-  TEST_RR_OP( 7, rem,  0, -1<<63, -1 );
+  TEST_RR_OP( 6, rem,  0, -1<<31,  1 );
+  TEST_RR_OP( 7, rem,  0, -1<<31, -1 );
 
-  TEST_RR_OP( 8, rem, -1<<63, -1<<63, 0 );
+  TEST_RR_OP( 8, rem, -1<<31, -1<<31, 0 );
   TEST_RR_OP( 9, rem,      1,      1, 0 );
   TEST_RR_OP(10, rem,      0,      0, 0 );
 
diff --git a/tests/remu.S b/tests/remu.S
index 38d641d..a96cfc1 100644
--- a/tests/remu.S
+++ b/tests/remu.S
@@ -22,10 +22,10 @@ RVTEST_CODE_BEGIN
   TEST_RR_OP( 4, remu,  20,  20,  -6 );
   TEST_RR_OP( 5, remu, -20, -20,  -6 );
 
-  TEST_RR_OP( 6, remu,      0, -1<<63,  1 );
-  TEST_RR_OP( 7, remu, -1<<63, -1<<63, -1 );
+  TEST_RR_OP( 6, remu,      0, -1<<31,  1 );
+  TEST_RR_OP( 7, remu, -1<<31, -1<<31, -1 );
 
-  TEST_RR_OP( 8, remu, -1<<63, -1<<63, 0 );
+  TEST_RR_OP( 8, remu, -1<<31, -1<<31, 0 );
   TEST_RR_OP( 9, remu,      1,      1, 0 );
   TEST_RR_OP(10, remu,      0,      0, 0 );