diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be56639748b..3fa27e3465a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-20  Richard Henderson  <rth@redhat.com>
+
+	* config/c6x/eqd.c, config/c6x/eqf.c, config/c6x/ged.c,
+	config/c6x/gef.c, config/c6x/gtd.c, config/c6x/gtf.c, 
+	config/c6x/led.c, config/c6x/lef.c, config/c6x/ltd.c,
+	config/c6x/ltf.c: Adjust include path for soft-fp.
+
 2011-08-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR other/46770
diff --git a/gcc/config/c6x/eqd.c b/gcc/config/c6x/eqd.c
index c19f88683a9..d6b32013bcb 100644
--- a/gcc/config/c6x/eqd.c
+++ b/gcc/config/c6x/eqd.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/double.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/double.h>
 
 CMPtype __c6xabi_eqd(DFtype a, DFtype b)
 {
diff --git a/gcc/config/c6x/eqf.c b/gcc/config/c6x/eqf.c
index c87c92b7433..ee6dafc98b7 100644
--- a/gcc/config/c6x/eqf.c
+++ b/gcc/config/c6x/eqf.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/single.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/single.h>
 
 CMPtype __c6xabi_eqf(SFtype a, SFtype b)
 {
diff --git a/gcc/config/c6x/ged.c b/gcc/config/c6x/ged.c
index 30590b259ef..2089904f92a 100644
--- a/gcc/config/c6x/ged.c
+++ b/gcc/config/c6x/ged.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/double.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/double.h>
 
 CMPtype __c6xabi_ged(DFtype a, DFtype b)
 {
diff --git a/gcc/config/c6x/gef.c b/gcc/config/c6x/gef.c
index 0a22b13b64b..ce4c1c0af3d 100644
--- a/gcc/config/c6x/gef.c
+++ b/gcc/config/c6x/gef.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/single.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/single.h>
 
 CMPtype __c6xabi_gef(SFtype a, SFtype b)
 {
diff --git a/gcc/config/c6x/gtd.c b/gcc/config/c6x/gtd.c
index 042192b5235..6d45aef9af8 100644
--- a/gcc/config/c6x/gtd.c
+++ b/gcc/config/c6x/gtd.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/double.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/double.h>
 
 CMPtype __c6xabi_gtd(DFtype a, DFtype b)
 {
diff --git a/gcc/config/c6x/gtf.c b/gcc/config/c6x/gtf.c
index 0d0e10a0df5..c6a108a2833 100644
--- a/gcc/config/c6x/gtf.c
+++ b/gcc/config/c6x/gtf.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/single.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/single.h>
 
 CMPtype __c6xabi_gtf(SFtype a, SFtype b)
 {
diff --git a/gcc/config/c6x/led.c b/gcc/config/c6x/led.c
index b97f3d15c1e..c99e29e0ddf 100644
--- a/gcc/config/c6x/led.c
+++ b/gcc/config/c6x/led.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/double.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/double.h>
 
 CMPtype __c6xabi_led(DFtype a, DFtype b)
 {
diff --git a/gcc/config/c6x/lef.c b/gcc/config/c6x/lef.c
index d234a180d77..ce2c16f8ede 100644
--- a/gcc/config/c6x/lef.c
+++ b/gcc/config/c6x/lef.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/single.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/single.h>
 
 CMPtype __c6xabi_lef(SFtype a, SFtype b)
 {
diff --git a/gcc/config/c6x/ltd.c b/gcc/config/c6x/ltd.c
index 55185839d81..d4de25866b7 100644
--- a/gcc/config/c6x/ltd.c
+++ b/gcc/config/c6x/ltd.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/double.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/double.h>
 
 CMPtype __c6xabi_ltd(DFtype a, DFtype b)
 {
diff --git a/gcc/config/c6x/ltf.c b/gcc/config/c6x/ltf.c
index 7ffe9f8d083..2fe15b99fde 100644
--- a/gcc/config/c6x/ltf.c
+++ b/gcc/config/c6x/ltf.c
@@ -27,8 +27,8 @@
    License along with GCC; see the file COPYING.LIB.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "config/soft-fp/soft-fp.h"
-#include "config/soft-fp/single.h"
+#include <soft-fp/soft-fp.h>
+#include <soft-fp/single.h>
 
 CMPtype __c6xabi_ltf(SFtype a, SFtype b)
 {