diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fd656af7a0..62a4e6408bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-27  Anthony Green  <green@moxielogic.com>
+
+	* config.gcc: Add moxie-*-moxiebox* configuration.
+	* config/moxie/moxiebox.h: New file.
+
 2014-07-26  Andrew Pinski  <apinski@cavium.com>
 
 	* config/aarch64/aarch64.md (*extr_insv_lower_reg<mode>): Remove +
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 9b3637e1ae3..7a3d3770844 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1168,6 +1168,12 @@ moxie-*-rtems*)
 	tmake_file="${tmake_file} moxie/t-moxie"
 	tm_file="moxie/moxie.h dbxelf.h elfos.h moxie/rtems.h rtems.h newlib-stdint.h"
 	;;
+moxie-*-moxiebox*)
+	gas=yes
+	gnu_ld=yes
+	tm_file="${tm_file} dbxelf.h elfos.h moxie/moxiebox.h newlib-stdint.h"
+	tmake_file="${tmake_file} moxie/t-moxiebox"
+	;;
 h8300-*-rtems*)
 	tmake_file="${tmake_file} h8300/t-h8300 h8300/t-rtems"
 	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h newlib-stdint.h"
diff --git a/gcc/config/moxie/moxiebox.h b/gcc/config/moxie/moxiebox.h
new file mode 100644
index 00000000000..0f75e5dfb3e
--- /dev/null
+++ b/gcc/config/moxie/moxiebox.h
@@ -0,0 +1,47 @@
+/* Definitions for the moxiebox.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+   Contributed by Anthony Green (green@moxielogic.com)
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+/* Target OS preprocessor built-ins.  */
+#define TARGET_OS_CPP_BUILTINS()		\
+  do						\
+    {						\
+      builtin_define_std ("moxie");		\
+      builtin_define ("__moxiebox__");		\
+      builtin_assert ("system=moxiebox");	\
+    }						\
+  while (0)
+
+#undef LIB_SPEC
+#define LIB_SPEC \
+"%{!T*:-Tmoxiebox.ld} \
+ %{!nostdlib: --start-group -lsandboxrt -lc -lgcc --end-group }"
+
+#undef LINK_SPEC
+#define LINK_SPEC "%{h*} %{v:-V} -EL -Bstatic"
+
+#undef  ASM_SPEC
+#define ASM_SPEC "-EL"
+
+#undef MULTILIB_DEFAULTS
+
+#undef SIZE_TYPE
+#undef PTRDIFF_TYPE
+#undef WCHAR_TYPE
+#undef WCHAR_TYPE_SIZE
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 60b857b5abc..4e5599c06ee 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-27  Anthony Green  <green@moxielogic.com>
+
+	* config.host: Add moxiebox configuration suppport.
+
 2014-07-27  Nathan Sidwell  <nathan@acm.org>
 
 	* libgcov-driver.c (struct gcov_filename_aux): Rename ...