diff --git a/Makefile b/Makefile
index e732516..e38502f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ STANDALONE = y
 
 # GCC_VERSION = 6.4.0
 GCC_VERSION = 7.3.0
+# GCC_VERSION = 8.2.0
 CT_GCC_VERSION = $(shell echo $(GCC_VERSION) | sed -e 's/\./_/g')
 
 # Directory to install toolchain to, by default inside current dir.
diff --git a/crosstool-ng b/crosstool-ng
index 061ee5c..60c498e 160000
--- a/crosstool-ng
+++ b/crosstool-ng
@@ -1 +1 @@
-Subproject commit 061ee5c7143e4acb8408b7ab259dc0c91188018b
+Subproject commit 60c498ecbedcc5076cf0da09bb2468eb413b94cb