diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b52cb379c7..c183d6fe8c4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-24  Per Bothner  <per@bothner.com>
+
+	* c-opts.c (finish_options):  Make the line-number of the <built-in>
+	location 0, as assumed elsewhere, rather than 1.
+
 2005-04-24  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-ssa-uncprop.c (equiv_stack): Change the type o
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 506543a108c..4ac8e9d4395 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1302,7 +1302,10 @@ finish_options (void)
     {
       size_t i;
 
-      cpp_change_file (parse_in, LC_RENAME, _("<built-in>"));
+      cb_file_change (parse_in,
+		      linemap_add (&line_table, LC_RENAME, 0,
+				   _("<built-in>"), 0));
+
       cpp_init_builtins (parse_in, flag_hosted);
       c_cpp_builtins (parse_in);