diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c486023936cc..7760029e8327 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-12  Walter Lee  <walt@tilera.com>
+
+        * config/tilepro/t-tilepro: Replace CC_FOR_BUILD with
+          CXX_FOR_BUILD.
+        * config/tilegx/t-tilegx: Likewise.
+
 2016-02-12  David Malcolm  <dmalcolm@redhat.com>
 
 	PR other/69554
diff --git a/gcc/config/tilegx/t-tilegx b/gcc/config/tilegx/t-tilegx
index 4e3203cd1b7e..20ee6d39e897 100644
--- a/gcc/config/tilegx/t-tilegx
+++ b/gcc/config/tilegx/t-tilegx
@@ -12,7 +12,7 @@ tilegx-c.o: $(srcdir)/config/tilegx/tilegx-c.c \
 
 $(srcdir)/config/tilegx/mul-tables.c: \
     $(srcdir)/config/tilepro/gen-mul-tables.cc
-	$(CC_FOR_BUILD) $(BUILD_CPPFLAGS) -O2 -o gen-mul-tables -lstdc++ $<;
+	$(CXX_FOR_BUILD) $(BUILD_CPPFLAGS) -O2 -o gen-mul-tables $<;
 	./gen-mul-tables > $@
 
 mul-tables.o: $(srcdir)/config/tilegx/mul-tables.c \
diff --git a/gcc/config/tilepro/t-tilepro b/gcc/config/tilepro/t-tilepro
index bc2a5aa5b669..859331b05758 100644
--- a/gcc/config/tilepro/t-tilepro
+++ b/gcc/config/tilepro/t-tilepro
@@ -5,8 +5,8 @@ tilepro-c.o: $(srcdir)/config/tilepro/tilepro-c.c \
 
 $(srcdir)/config/tilepro/mul-tables.c: \
     $(srcdir)/config/tilepro/gen-mul-tables.cc
-	$(CC_FOR_BUILD) $(BUILD_CPPFLAGS) -O2 -DTILEPRO \
-	  -o gen-mul-tables -lstdc++ $<;
+	$(CXX_FOR_BUILD) $(BUILD_CPPFLAGS) -O2 -DTILEPRO \
+	  -o gen-mul-tables $<;
 	./gen-mul-tables > $@
 
 mul-tables.o: $(srcdir)/config/tilepro/mul-tables.c \