2013-06-03  Magnus Granberg  <zorry@gentoo.org>

	* gcc/config/arm/arm.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC.
	* gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS.

--- a/gcc/config/arm/arm.h	2015-06-02 08:42:53.724969452 +0000
+++ b/gcc/config/arm/arm.h	2015-06-02 08:46:26.515546804 +0000
@@ -2411,6 +2411,12 @@
 # define EXTRA_SPEC_FUNCTIONS BIG_LITTLE_CPU_SPEC_FUNCTIONS
 #endif
 
-#define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS
+#ifdef ENABLE_ESP
+# define DRIVER_SELF_SPECS \
+  MCPU_MTUNE_NATIVE_SPECS, \
+  ESP_DRIVER_SELF_SPEC
+#else
+# define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS
+#endif
 #define TARGET_SUPPORTS_WIDE_INT 1
 #endif /* ! GCC_ARM_H */
--- a/gcc/config/arm/elf.h	2013-01-10 21:38:27.000000000 +0100
+++ b/gcc/config/arm/elf.h	2013-05-19 02:15:49.595855825 +0200
@@ -49,7 +49,11 @@
 #endif
 
 #undef SUBSUBTARGET_EXTRA_SPECS
+#ifdef ENABLE_ESP
+#define SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS
+#else
 #define SUBSUBTARGET_EXTRA_SPECS
+#endif
 
 #ifndef ASM_SPEC
 #define ASM_SPEC "\