diff --git a/ChangeLog b/ChangeLog
index c06d29ace95d..6441466baadf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-09  Sandra Loosemore  <sandra@codesourcery.com>
+            Nigel Stephens <nigel@mips.com>
+
+	* doc/invoke.texi (Overall Options):  Add .sx file extension
+	as a synonym for .S.
+	* cppspec.c (known_suffixes): Likewise.
+	* gcc.c (default_compilers): Likewise.
+
 2007-09-07  Andrew Haley  <aph@redhat.com>
 
 	* configure.ac (noconfigdirs): Remove target-libffi and
diff --git a/gcc/cppspec.c b/gcc/cppspec.c
index 8c57ca3db2e9..344da17a37ed 100644
--- a/gcc/cppspec.c
+++ b/gcc/cppspec.c
@@ -45,6 +45,7 @@ static const char *const known_suffixes[] =
 {
   ".c",  ".C",   ".S",   ".m",
   ".cc", ".cxx", ".cpp", ".cp",  ".c++",
+  ".sx",
   NULL
 };
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 0761733170e6..7413abd3ef33 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -978,6 +978,7 @@ package body).  Such files are also called @dfn{bodies}.
 Assembler code.
 
 @item @var{file}.S
+@itemx @var{file}.sx
 Assembler code which must be preprocessed.
 
 @item @var{other}
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 99bcd787f06d..e40156a64171 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1023,6 +1023,7 @@ static const struct compiler default_compilers[] =
   {".s", "@assembler", 0, 1, 0},
   {"@assembler",
    "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
+  {".sx", "@assembler-with-cpp", 0, 1, 0},
   {".S", "@assembler-with-cpp", 0, 1, 0},
   {"@assembler-with-cpp",
 #ifdef AS_NEEDS_DASH_FOR_PIPED_INPUT