diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 71a49e878f0ad23a211001506f664f503823d1ed..4bd70ee877fe12a6823a28fbd0fc2e9a6bb9010a 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-29  Tamar Christina  <tamar.christina@arm.com>
+
+	PR ada/81878
+	* Makefile.in (TOOLS_FLAGS_TO_PASS_NATIVE): Add -B ../../.
+
 2017-08-17  Richard Biener  <rguenther@suse.de>
 
 	PR ada/81878
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index d19147fe5d74753249d9b9d8dceab79da72b1537..8a98a2d0b1895b1798e22a31b44c6e0c9bc4ab73 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -70,9 +70,12 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
 ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
 
 # Variables for gnattools, native
+# Due to Windows path translations (See PR ada/81878) we need to add
+# -B../../ to the compiler paths as a workaround for that $(CXX) contains
+# Unix style paths that won't be translated by the runtime.
 TOOLS_FLAGS_TO_PASS_NATIVE= \
 	"CC=../../xgcc -B../../" \
-	"CXX=$(CXX)" \
+	"CXX=$(CXX) -B../../" \
 	"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"ADAFLAGS=$(ADAFLAGS)" \