diff --git a/lib/config.json b/lib/config.json
index 150b280..e9b47c6 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -44,13 +44,16 @@
 		   "admin" : "n54@gmx.com" },
 
 		 { "name" : "ubuntu-aarch64-1", "arch" : "aarch64", "jobs" : "4",
+		   "admin" : "qiyaoltc@gmail.com" },
+
+		 { "name" : "", "arch" : "arm", "jobs" : "",
 		   "admin" : "qiyaoltc@gmail.com" }
 	       ],
 
     "builders" : [ { "name" : "Fedora-x86_64-m64", "type" : "Plain_c64t64",
 		     "builddir" : "fedora-x86-64",
 		     "PATH" : "/usr/local/bin:/usr/bin:/bin",
-		     "tags" : [ "fedora", "x86_64", "m64", "MAIL", "TRY" ],
+		     "tags" : [ "fedora", "x86_64", "m64", "MAIL" ],
 		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2",
 				      "fedora-x86-64-3", "fedora-x86-64-4" ] },
 
@@ -271,7 +274,14 @@
 		     "type" : "NativeGDBServer_c64t64",
 		     "builddir" : "ubuntu-aarch64-native-gdbserver-m64",
 		     "tags" : [ "ubuntu", "aarch64", "native-gdbserver", "m64", "MAIL" ],
-		     "slavenames" : [ "ubuntu-aarch64-1" ] }
+		     "slavenames" : [ "ubuntu-aarch64-1" ] },
+
+		   { "name" : "ARM-",
+		     "arch_triplet" : "arm-linux-gnueabihf",
+		     "type" : "ARMYaoPlain_c32t32",
+		     "builddir" : "",
+		     "tags" : [ "arm", "", "m32", "MAIL" ],
+		     "slavenames" : [ "" ] }
 		 ],
 
     "schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
diff --git a/master.cfg b/master.cfg
index b0a91b2..f57e540 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1105,6 +1105,24 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64):
     """Compiling for AIX"""
     pass
 
+
+# Classes needed for ARM (Yao)
+
+class RunTestGDBARMYao_Common (BuildAndTestGDBFactory):
+    """Common ARM configurations"""
+    def __init__ (self, **kwargs):
+        path = '/home/qiyao/gcc-7/arm-linux-gnueabihf'
+        self.extra_conf_flags = [ 'CC=%s/bin/arm-linux-gnueabihf-gcc --sysroot=%s/sysroot' % (path, path),
+                                  'CXX=%s/bin/arm-linux-gnueabihf-g++ --sysroot=%s/sysroot' % (path, path),
+                                  'LDFLAGS=-Wl,-dynamic-linker,%s/sysroot/lib/ld-linux-armhf.so.3 -Wl,-rpath,%s/sysroot/lib -Wl,-rpath,%s/sysroot/usr/lib -Wl,-rpath,%s/lib' % (path, path, path, path) ]
+        self.test_env = { 'DEJAGNU' : '/home/qiyao/buildslave/site.exp' }
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
+class RunTestGDBARMYaoPlain_c32t32 (RunTestGDBARMYao_Common):
+    def __init__ (self, **kwargs):
+        self.extra_make_check_flags = [ 'RUNTESTFLAGS=--target_board unix-aarch32' ]
+        RunTestGDBARMYao_Common.__init__ (self, **kwargs)
+
 # All branches that are going to be watched.
 all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)