diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9eadbce391a99babff31c9852a843f202514db20..d436d368b1899760fbe49414e7f16ca69fb329b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* Makefile.in (OBJS): Move sbitmap.o from here ...
+	(OBJS-libcommon): ... to here.
+
 2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm-isa.h (ISA_ALL_FPU_INTERNAL): Renamed from ISA_ALL_FPU.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index da98c8e864a374c032b750912dfd93fbaa0ce603..67d69c1c0d2695f4ff2cf177e16ba87aca8736fd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1441,7 +1441,6 @@ OBJS = \
 	rtlanal.o \
 	rtlhooks.o \
 	run-rtl-passes.o \
-	sbitmap.o \
 	sched-deps.o \
 	sched-ebb.o \
 	sched-rgn.o \
@@ -1587,6 +1586,7 @@ OBJS = \
 OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
 	edit-context.o \
 	pretty-print.o intl.o \
+	sbitmap.o \
 	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
 	selftest.o