Use more compilers from /opt

etc/config/c++.amazon.properties

@@ -1,11 +1,26 @@
-compilers=gcc1204@20480:clang350:clang351:g482:g492:g510:g520:g530:ppcg48:aarchg48:armhfg482:clang37x:clang36x:clang371:clang380:g6:g62:mips5:mips5el:mips564:mips564el
+compilers=gcc1204@20480:clang350:clang351:g473:g474:g481:g485:g490:g493:g494:g510:g520:g530:ppcg48:aarchg48:armhfg482:clang37x:clang36x:clang371:clang380:g6:g62:mips5:mips5el:mips564:mips564el
 defaultCompiler=g62
 ###############################
 # GCC for x86
-compiler.g482.exe=/usr/bin/g++-4.8
-compiler.g482.name=x86-64 gcc 4.8.2
-compiler.g492.exe=/usr/bin/g++-4.9
-compiler.g492.name=x86-64 gcc 4.9.2
+compiler.g473.exe=/opt/gcc-explorer/gcc-4.7.3/bin/g++
+compiler.g473.name=x86-64 gcc 4.7.3
+compiler.g473.alias=/usr/bin/g++-4.7
+compiler.g474.exe=/opt/gcc-explorer/gcc-4.7.4/bin/g++
+compiler.g474.name=x86-64 gcc 4.7.4
+compiler.g481.exe=/opt/gcc-explorer/gcc-4.8.1/bin/g++
+compiler.g481.name=x86-64 gcc 4.8.1
+# Ubuntu 48 became 485; alias 482 to 485
+compiler.g485.exe=/opt/gcc-explorer/gcc-4.8.5/bin/g++
+compiler.g485.name=x86-64 gcc 4.8.5
+compiler.g485.alias=g482
+compiler.g490.exe=/opt/gcc-explorer/gcc-4.9.0/bin/g++
+compiler.g490.name=x86-64 gcc 4.9.0
+# Ubuntu 49 became 493; alias 492 to 493
+compiler.g493.exe=/usr/bin/g++-4.9
+compiler.g493.name=x86-64 gcc 4.9.3
+compiler.g493.alias=g492
+compiler.g494.exe=/opt/gcc-explorer/gcc-4.9.4/bin/g++
+compiler.g494.name=x86-64 gcc 4.9.4
 compiler.g510.exe=/opt/gcc-explorer/gcc-5.1.0/bin/g++
 compiler.g510.name=x86-64 gcc 5.1
 compiler.g520.exe=/opt/gcc-explorer/gcc-5.2.0/bin/g++

etc/config/c++.amazon1204.properties

@@ -1,6 +1,6 @@
-compilers=g447:g453:g464:g473:g481:g490:armg453:clang30:avrg453:armg463:icc1301:clang32:clang33:clang341:g490c1:g490c2
+compilers=g447:g453:g464:armg453:clang30:avrg453:armg463:icc1301:clang32:clang33:clang341
 # disabled still causes client to die: msp430g453
-defaultCompiler=g490
+defaultCompiler=g447
 ###############################
 # GCC for x86
 compiler.g447.exe=/usr/bin/g++-4.4
@@ -12,25 +12,6 @@ compiler.g453.name=x86-64 gcc 4.5.3
 compiler.g464.exe=/usr/bin/g++-4.6
 compiler.g464.alias=/usr/bin/g++-4.6
 compiler.g464.name=x86-64 gcc 4.6.4
-compiler.g473.exe=/usr/bin/g++-4.7
-compiler.g473.alias=/usr/bin/g++-4.7
-compiler.g473.name=x86-64 gcc 4.7.3
-compiler.g481.exe=/usr/bin/g++-4.8
-compiler.g481.alias=/usr/bin/g++-4.8
-compiler.g481.name=x86-64 gcc 4.8.1
-compiler.g490.exe=/opt/gcc-explorer/gcc-4.9.0/bin/g++
-compiler.g490.alias=/opt/gcc-4.9.0/bin/g++
-compiler.g490.name=x86-64 gcc 4.9.0
-compiler.g490.supportsBinary=false
-# GCC (concepts branch) for x86
-compiler.g490c1.exe=/opt/gcc-explorer/gcc-4.9.0-with-concepts/bin/g++
-compiler.g490c1.alias=/opt/gcc-4.9.0-with-concepts/bin/g++
-compiler.g490c1.name=x86-64 gcc 4.9.0 (w/concepts)
-compiler.g490c1.supportsBinary=false
-compiler.g490c2.exe=/opt/gcc-explorer/gcc-4.9.0-0909-concepts/bin/g++
-compiler.g490c2.alias=/opt/gcc-4.9.0-0909-concepts/bin/g++
-compiler.g490c2.name=x86-64 gcc 4.9.0 (w/concepts)
-compiler.g490c2.supportsBinary=false
 # Intel for x86
 compiler.icc1301.exe=/opt/gcc-explorer/intel/bin/icc
 compiler.icc1301.alias=/opt/intel/bin/icc