diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 261926af016e53c0b75169f0db3574d91120b03f..9cb013809eabda9562e3ef16a553d6d29f930d81 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-17  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR c/25993
+	* c-opts.c (c_common_handle_option): Ignore the -std options
+	if the input language is assembly.
+
 2006-09-17  Ira Rosen  <irar@il.ibm.com>
 
         PR tree-opt/21591
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 2937b7995cd8670926b379e269ce9ffb4ceb160d..5821deabb969ab642daa2218e1722cff2fd21d73 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -268,6 +268,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
   enum opt_code code = (enum opt_code) scode;
   int result = 1;
 
+  /* Prevent resetting the language standard to a C dialect when the driver
+     has already determined that we're looking at assembler input.  */
+  bool preprocessing_asm_p = (cpp_get_options (parse_in)->lang == CLK_ASM);
+ 
   switch (code)
     {
     default:
@@ -905,29 +909,34 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 
     case OPT_std_c__98:
     case OPT_std_gnu__98:
-      set_std_cxx98 (code == OPT_std_c__98 /* ISO */);
+      if (!preprocessing_asm_p)
+	set_std_cxx98 (code == OPT_std_c__98 /* ISO */);
       break;
 
     case OPT_std_c89:
     case OPT_std_iso9899_1990:
     case OPT_std_iso9899_199409:
-      set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */);
+      if (!preprocessing_asm_p)
+	set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */);
       break;
 
     case OPT_std_gnu89:
-      set_std_c89 (false /* c94 */, false /* ISO */);
+      if (!preprocessing_asm_p)
+	set_std_c89 (false /* c94 */, false /* ISO */);
       break;
 
     case OPT_std_c99:
     case OPT_std_c9x:
     case OPT_std_iso9899_1999:
     case OPT_std_iso9899_199x:
-      set_std_c99 (true /* ISO */);
+      if (!preprocessing_asm_p)
+	set_std_c99 (true /* ISO */);
       break;
 
     case OPT_std_gnu99:
     case OPT_std_gnu9x:
-      set_std_c99 (false /* ISO */);
+      if (!preprocessing_asm_p)
+	set_std_c99 (false /* ISO */);
       break;
 
     case OPT_trigraphs:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 89cc01b37f174f713b0851d93fb226aa440f2514..0864aeb373e2818c064dcc19c6281ce8a6065371 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-16  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR c/25993
+	* gcc.dg/pr25993.c: New test.
+
 2006-09-17  Ira Rosen  <irar@il.ibm.com>
 
         PR tree-opt/21591
diff --git a/gcc/testsuite/gcc.dg/pr25993.c b/gcc/testsuite/gcc.dg/pr25993.c
new file mode 100644
index 0000000000000000000000000000000000000000..392bbedfeb1cfd371293f6448f9327f6a9da05e7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr25993.c
@@ -0,0 +1,14 @@
+/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-std=c99 -x assembler-with-cpp" } */
+
+#ifndef __ASSEMBLER__
+extern int func(void);
+#else
+.global func
+.type func,%function
+.align 4
+func:
+        ret
+.size func,.-func
+#endif
+