diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c98eb1ffe902d7e8b469c02ebcaaec626f5be9b..f09fcd74a80d2af3d2ccb069248c4c143ffdb2cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-07  Nick Clifton  <nickc@redhat.com>
+
+	* config/elfos.h (TARGET_ASM_RECORD_GCC_SWITCHES): Set to
+	elf_record_gcc_switches.
+
 2006-12-07  Andrew Macleod  <amacleod@redhat.com>
 
 	* expr.c (string_constant): Account for non-zero lower bound arrays.
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 9aa24975ca4a4005ef80807ce61c9e0abfb66b7e..cc27b3f18e11334eeceb22ab0ba6a8664a935871 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -499,3 +499,8 @@ Boston, MA 02110-1301, USA.  */
         fprintf ((FILE), "\"\n");					\
     }									\
   while (0)
+
+/* Allow the use of the -frecord-gcc-switches switch via the
+   elf_record_gcc_switches function defined in varasm.c.  */
+#undef  TARGET_ASM_RECORD_GCC_SWITCHES
+#define TARGET_ASM_RECORD_GCC_SWITCHES elf_record_gcc_switches