diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 966d8b511e9..e1eeb8c6d80 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,37 @@
+2003-06-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* rtl.h (emit_note): Remove FILE parameter.
+	* emit-rtl.c (emit_line_note): Adjust emit_note call.
+	(emit_note): Remove FILE parameter. Adjust.
+	* builtins.c (expand_builtin_expect): Adjust emit_note call.
+	* c-semantics.c (genrtl_scope_stmt): Likewise.
+	(expand_stmt): Likewise.
+	* cfglayout.c (reemit_insn_block_notes): Likewise.
+	(duplicate_insn_chain): Likewise.
+	* except.c (expand_eh_region_start, expand_eh_region_end,
+	sjlj_emit_function_enter): Likewise.
+	* explow.c (probe_stack_range): Likewise.
+	* expr.c (emit_block_move_via_loop): Likewise.
+	* function.c (init_function_start, expand_function_start,
+	expand_function_end, thread_prologue_and_epilogue_insns): Likewise.
+	* integrate.c (expand_inline_function, copy_insn_list): Likewise.
+	* reg-stack.c (compensate_edge): Likewise.
+	* reload1.c (reload): Likewise.
+	* rtlanal.c (hoist_insn_to_edge): Likewise.
+	* stmt.c (expand_fixup, expand_start_loop, expand_start_null_loop,
+	expand_loop_continue_here, expand_end_loop, expand_continue_loop,
+	expand_exit_loop_top_cond, expand_value_return,
+	expand_start_bindings_and_block, expand_end_bindings,
+	expand_decl_cleanup, expand_start_case): Likewise.
+	* unroll.c (copy_loop_body
+	* config/alpha/alpha.c (alpha_output_mi_thunk_osf): Likewise.
+	* config/ia64/ia64.c (ia64_output_mi_thunk): Likewise.
+	* config/rs6000/rs6000.c (rs6000_emit_eh_toc_restore,
+	rs6000_emit_allocate_stack, rs6000_output_function_prologue,
+	rs6000_output_function_epilogue, rs6000_output_mi_thunk): Likewise.
+	* config/sh/sh.c (sh_output_mi_thunk): Likewise.
+	* config/sparc/sparc.c (sparc_output_mi_thunk): Likewise.
+
 2003-06-27  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* c-tree.h (grokfield): Remove unused filename and line parameters.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 53ca9568be0..8160333c66f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* misc.c (record_code_position): Adjust emit_note call.
+
 2003-06-26  Neil Booth  <neil@daikokuya.co.uk>
 
 	* misc.c (gnat_handle_option): Don't check for missing arguments.
diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index 4884fe9c268..e0ee975215d 100644
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -719,7 +719,7 @@ record_code_position (gnat_node)
        addressable needs some fixups and also for above reason.  */
     save_gnu_tree (gnat_node,
 		   build (RTL_EXPR, void_type_node, NULL_TREE,
-			  (tree) emit_note (0, NOTE_INSN_DELETED)),
+			  (tree) emit_note (NOTE_INSN_DELETED)),
 		   1);
 }
 
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 44ecbdedcf2..20ccda3dfe6 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4301,7 +4301,7 @@ expand_builtin_expect (tree arglist, rtx target)
 
       rtx_c = expand_expr (c, NULL_RTX, GET_MODE (target), EXPAND_NORMAL);
 
-      note = emit_note (NULL, NOTE_INSN_EXPECTED_VALUE);
+      note = emit_note (NOTE_INSN_EXPECTED_VALUE);
       NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, target, rtx_c);
     }
 
diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c
index 3d747e62d7f..e75caa70101 100644
--- a/gcc/c-semantics.c
+++ b/gcc/c-semantics.c
@@ -629,10 +629,8 @@ genrtl_scope_stmt (tree t)
     }
   else if (!SCOPE_NULLIFIED_P (t))
     {
-      rtx note = emit_note (NULL,
-			    (SCOPE_BEGIN_P (t)
-			     ? NOTE_INSN_BLOCK_BEG
-			     : NOTE_INSN_BLOCK_END));
+      rtx note = emit_note (SCOPE_BEGIN_P (t)
+			    ? NOTE_INSN_BLOCK_BEG : NOTE_INSN_BLOCK_END);
       NOTE_BLOCK (note) = block;
     }
 
@@ -858,7 +856,7 @@ expand_stmt (tree t)
 	      && TREE_CODE (GOTO_DESTINATION (t)) == LABEL_DECL
 	      && flag_guess_branch_prob)
 	    {
-	      rtx note = emit_note (NULL, NOTE_INSN_PREDICTION);
+	      rtx note = emit_note (NOTE_INSN_PREDICTION);
 
 	      NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_GOTO, NOT_TAKEN);
 	    }
diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index eea7b942265..736d8887ec5 100644
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -513,7 +513,7 @@ reemit_insn_block_notes (void)
     }
 
   /* change_scope emits before the insn, not after.  */
-  note = emit_note (NULL, NOTE_INSN_DELETED);
+  note = emit_note (NOTE_INSN_DELETED);
   change_scope (note, cur_block, DECL_INITIAL (cfun->decl));
   delete_insn (note);
 
@@ -943,7 +943,7 @@ duplicate_insn_chain (rtx from, rtx to)
 
   /* Avoid updating of boundaries of previous basic block.  The
      note will get removed from insn stream in fixup.  */
-  last = emit_note (NULL, NOTE_INSN_DELETED);
+  last = emit_note (NOTE_INSN_DELETED);
 
   /* Create copy at the end of INSN chain.  The chain will
      be reordered later.  */
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 5e16e8ee93b..1d1be31db95 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -7658,7 +7658,7 @@ alpha_output_mi_thunk_osf (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
 
   /* We always require a valid GP.  */
   emit_insn (gen_prologue_ldgp ());
-  emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+  emit_note (NOTE_INSN_PROLOGUE_END);
 
   /* Find the "this" pointer.  If the function returns a structure,
      the structure return pointer is in $16.  */
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 3803033a4b8..e610f62bb8f 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -8491,7 +8491,7 @@ ia64_output_mi_thunk (file, thunk, delta, vcall_offset, function)
     reg_names[IN_REG (0)] = ia64_reg_numbers[0];
 
   /* Mark the end of the (empty) prologue.  */
-  emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+  emit_note (NOTE_INSN_PROLOGUE_END);
 
   this = gen_rtx_REG (Pmode, IN_REG (0));
 
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 2e1ceef9129..a3eb255a231 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -10706,7 +10706,7 @@ rs6000_emit_eh_toc_restore (stacksize)
     abort ();
   emit_move_insn (opcode, insn_after_throw);
   
-  emit_note (NULL, NOTE_INSN_LOOP_BEG);
+  emit_note (NOTE_INSN_LOOP_BEG);
   emit_label (loop_start);
   
   do_compare_rtx_and_jump (opcode, tocompare, NE, 1,
@@ -10733,9 +10733,9 @@ rs6000_emit_eh_toc_restore (stacksize)
   emit_move_insn (opcode_addr, mem);
   emit_move_insn (opcode, gen_rtx_MEM (SImode, opcode_addr));
 
-  emit_note (NULL, NOTE_INSN_LOOP_CONT);
+  emit_note (NOTE_INSN_LOOP_CONT);
   emit_jump (loop_start);
-  emit_note (NULL, NOTE_INSN_LOOP_END);
+  emit_note (NOTE_INSN_LOOP_END);
   emit_label (loop_exit);
 }
 
@@ -10809,7 +10809,7 @@ rs6000_emit_allocate_stack (size, copy_r12)
 	{
 	  /* Need a note here so that try_split doesn't get confused.  */
 	  if (get_last_insn() == NULL_RTX)
-	    emit_note (0, NOTE_INSN_DELETED);
+	    emit_note (NOTE_INSN_DELETED);
 	  insn = emit_move_insn (tmp_reg, todec);
 	  try_split (PATTERN (insn), insn, 0);
 	  todec = tmp_reg;
@@ -11536,9 +11536,9 @@ rs6000_output_function_prologue (file, size)
 
       /* A NOTE_INSN_DELETED is supposed to be at the start and end of
 	 the "toplevel" insn chain.  */
-      emit_note (0, NOTE_INSN_DELETED);
+      emit_note (NOTE_INSN_DELETED);
       rs6000_emit_prologue ();
-      emit_note (0, NOTE_INSN_DELETED);
+      emit_note (NOTE_INSN_DELETED);
 
       /* Expand INSN_ADDRESSES so final() doesn't crash. */
       {
@@ -11957,9 +11957,9 @@ rs6000_output_function_epilogue (file, size)
 
 	  /* A NOTE_INSN_DELETED is supposed to be at the start
 	     and end of the "toplevel" insn chain.  */
-	  emit_note (0, NOTE_INSN_DELETED);
+	  emit_note (NOTE_INSN_DELETED);
 	  rs6000_emit_epilogue (FALSE);
-	  emit_note (0, NOTE_INSN_DELETED);
+	  emit_note (NOTE_INSN_DELETED);
 
 	  /* Expand INSN_ADDRESSES so final() doesn't crash. */
 	  {
@@ -12254,7 +12254,7 @@ rs6000_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
   no_new_pseudos = 1;
 
   /* Mark the end of the (empty) prologue.  */
-  emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+  emit_note (NOTE_INSN_PROLOGUE_END);
 
   /* Find the "this" pointer.  If the function returns a structure,
      the structure return pointer is in r3.  */
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index dcd97d7019d..05c6c0ac889 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -8547,7 +8547,7 @@ sh_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
   no_new_pseudos = 1;
   current_function_uses_only_leaf_regs = 1;
 
-  emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+  emit_note (NOTE_INSN_PROLOGUE_END);
 
   /* Find the "this" pointer.  We have such a wide range of ABIs for the
      SH that it's best to do this completely machine independently.
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index fb41af1ff39..148bcee53f4 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -8593,7 +8593,7 @@ sparc_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
   no_new_pseudos = 1;
   current_function_uses_only_leaf_regs = 1;
 
-  emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+  emit_note (NOTE_INSN_PROLOGUE_END);
 
   /* Find the "this" pointer.  Normally in %o0, but in ARCH64 if the function
      returns a structure, the structure return pointer is there instead.  */
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 908b12db8ca..d54d1885258 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4899,6 +4899,8 @@ emit_line_note (file, line)
      const char *file;
      int line;
 {
+  rtx note;
+  
   if (line < 0)
     abort ();
   
@@ -4916,25 +4918,25 @@ emit_line_note (file, line)
       return NULL_RTX;
     }
 
-  return emit_note (file, line);
+  note = emit_note (line);
+  NOTE_SOURCE_FILE (note) = file;
+  
+  return note;
 }
 
-/* Make an insn of code NOTE
-   with data-fields specified by FILE and LINE
-   and add it to the end of the doubly-linked list.
-   If it is a line-number NOTE, omit it if it matches the previous one.  */
+/* Make an insn of code NOTE or type NOTE_NO
+   and add it to the end of the doubly-linked list.  */
 
 rtx
-emit_note (file, line)
-     const char *file;
-     int line;
+emit_note (note_no)
+     int note_no;
 {
   rtx note;
 
   note = rtx_alloc (NOTE);
   INSN_UID (note) = cur_insn_uid++;
-  NOTE_SOURCE_FILE (note) = file;
-  NOTE_LINE_NUMBER (note) = line;
+  NOTE_LINE_NUMBER (note) = note_no;
+  NOTE_DATA (note) = 0;
   BLOCK_FOR_INSN (note) = NULL;
   add_insn (note);
   return note;
diff --git a/gcc/except.c b/gcc/except.c
index 0ea1fc7bf09..39e72dfa70d 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -510,7 +510,7 @@ expand_eh_region_start ()
 
   /* Create a note marking the start of this region.  */
   new_region->region_number = ++cfun->eh->last_region_number;
-  note = emit_note (NULL, NOTE_INSN_EH_REGION_BEG);
+  note = emit_note (NOTE_INSN_EH_REGION_BEG);
   NOTE_EH_HANDLER (note) = new_region->region_number;
 }
 
@@ -523,7 +523,7 @@ expand_eh_region_end ()
   rtx note;
 
   /* Create a note marking the end of this region.  */
-  note = emit_note (NULL, NOTE_INSN_EH_REGION_END);
+  note = emit_note (NOTE_INSN_EH_REGION_END);
   NOTE_EH_HANDLER (note) = cur_region->region_number;
 
   /* Pop.  */
@@ -2119,7 +2119,7 @@ sjlj_emit_function_enter (dispatch_label)
 				 plus_constant (XEXP (fc, 0),
 						sjlj_fc_jbuf_ofs), Pmode);
 
-    note = emit_note (NULL, NOTE_INSN_EXPECTED_VALUE);
+    note = emit_note (NOTE_INSN_EXPECTED_VALUE);
     NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, x, const0_rtx);
 
     emit_cmp_and_jump_insns (x, const0_rtx, NE, 0,
diff --git a/gcc/explow.c b/gcc/explow.c
index cd0a15836a3..883edf8e9f4 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -1588,13 +1588,13 @@ probe_stack_range (first, size)
 	  || REGNO (test_addr) < FIRST_PSEUDO_REGISTER)
 	test_addr = force_reg (Pmode, test_addr);
 
-      emit_note (NULL, NOTE_INSN_LOOP_BEG);
+      emit_note (NOTE_INSN_LOOP_BEG);
       emit_jump (test_lab);
 
       emit_label (loop_lab);
       emit_stack_probe (test_addr);
 
-      emit_note (NULL, NOTE_INSN_LOOP_CONT);
+      emit_note (NOTE_INSN_LOOP_CONT);
 
 #ifdef STACK_GROWS_DOWNWARD
 #define CMP_OPCODE GTU
@@ -1613,7 +1613,7 @@ probe_stack_range (first, size)
       emit_cmp_and_jump_insns (test_addr, last_addr, CMP_OPCODE,
 			       NULL_RTX, Pmode, 1, loop_lab);
       emit_jump (end_lab);
-      emit_note (NULL, NOTE_INSN_LOOP_END);
+      emit_note (NOTE_INSN_LOOP_END);
       emit_label (end_lab);
 
       emit_stack_probe (last_addr);
diff --git a/gcc/expr.c b/gcc/expr.c
index 4b29993b401..849e778b0cb 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2146,7 +2146,7 @@ emit_block_move_via_loop (x, y, size, align)
   y_addr = force_operand (XEXP (y, 0), NULL_RTX);
   do_pending_stack_adjust ();
 
-  emit_note (NULL, NOTE_INSN_LOOP_BEG);
+  emit_note (NOTE_INSN_LOOP_BEG);
 
   emit_jump (cmp_label);
   emit_label (top_label);
@@ -2164,13 +2164,13 @@ emit_block_move_via_loop (x, y, size, align)
   if (tmp != iter)
     emit_move_insn (iter, tmp);
 
-  emit_note (NULL, NOTE_INSN_LOOP_CONT);
+  emit_note (NOTE_INSN_LOOP_CONT);
   emit_label (cmp_label);
 
   emit_cmp_and_jump_insns (iter, size, LT, NULL_RTX, iter_mode,
 			   true, top_label);
 
-  emit_note (NULL, NOTE_INSN_LOOP_END);
+  emit_note (NOTE_INSN_LOOP_END);
 }
 
 /* Copy all or part of a value X into registers starting at REGNO.
diff --git a/gcc/function.c b/gcc/function.c
index 58467237209..b2caea9959c 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -6549,7 +6549,7 @@ init_function_start (subr)
   /* Make sure first insn is a note even if we don't want linenums.
      This makes sure the first insn will never be deleted.
      Also, final expects a note to appear there.  */
-  emit_note (NULL, NOTE_INSN_DELETED);
+  emit_note (NOTE_INSN_DELETED);
 
   /* Set flags used by final.c.  */
   if (aggregate_value_p (DECL_RESULT (subr)))
@@ -6791,10 +6791,10 @@ expand_function_start (subr, parms_have_cleanups)
      The move is supposed to make sdb output more accurate.  */
   /* Indicate the beginning of the function body,
      as opposed to parm setup.  */
-  emit_note (NULL, NOTE_INSN_FUNCTION_BEG);
+  emit_note (NOTE_INSN_FUNCTION_BEG);
 
   if (GET_CODE (get_last_insn ()) != NOTE)
-    emit_note (NULL, NOTE_INSN_DELETED);
+    emit_note (NOTE_INSN_DELETED);
   parm_birth_insn = get_last_insn ();
 
   context_display = 0;
@@ -6868,7 +6868,7 @@ expand_function_start (subr, parms_have_cleanups)
   /* After the display initializations is where the tail-recursion label
      should go, if we end up needing one.   Ensure we have a NOTE here
      since some things (like trampolines) get placed before this.  */
-  tail_recursion_reentry = emit_note (NULL, NOTE_INSN_DELETED);
+  tail_recursion_reentry = emit_note (NOTE_INSN_DELETED);
 
   /* Evaluate now the sizes of any types declared among the arguments.  */
   expand_pending_sizes (nreverse (get_pending_sizes ()));
@@ -7080,7 +7080,7 @@ expand_function_end ()
   /* Mark the end of the function body.
      If control reaches this insn, the function can drop through
      without returning a value.  */
-  emit_note (NULL, NOTE_INSN_FUNCTION_END);
+  emit_note (NOTE_INSN_FUNCTION_END);
 
   /* Must mark the last line number note in the function, so that the test
      coverage code can avoid counting the last line twice.  This just tells
@@ -7088,10 +7088,11 @@ expand_function_end ()
      already exists a copy of this note somewhere above.  This line number
      note is still needed for debugging though, so we can't delete it.  */
   if (flag_test_coverage)
-    emit_note (NULL, NOTE_INSN_REPEATED_LINE_NUMBER);
+    emit_note (NOTE_INSN_REPEATED_LINE_NUMBER);
 
   /* Output a linenumber for the end of the function.
      SDB depends on this.  */
+  
   emit_line_note_force (input_filename, input_line);
 
   /* Before the return label (if any), clobber the return
@@ -7753,7 +7754,7 @@ thread_prologue_and_epilogue_insns (f)
 
       /* Retain a map of the prologue insns.  */
       record_insns (seq, &prologue);
-      prologue_end = emit_note (NULL, NOTE_INSN_PROLOGUE_END);
+      prologue_end = emit_note (NOTE_INSN_PROLOGUE_END);
 
       seq = get_insns ();
       end_sequence ();
@@ -7889,7 +7890,7 @@ thread_prologue_and_epilogue_insns (f)
 	goto epilogue_done;
 
       start_sequence ();
-      epilogue_end = emit_note (NULL, NOTE_INSN_EPILOGUE_BEG);
+      epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG);
 
       seq = gen_epilogue ();
 
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 0ac08f9e7b4..ab4af1823f1 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -897,7 +897,7 @@ expand_inline_function (fndecl, parms, target, ignore, type,
      insn that can be used as an insertion point.  */
   map->insns_at_start = get_last_insn ();
   if (map->insns_at_start == 0)
-    map->insns_at_start = emit_note (NULL, NOTE_INSN_DELETED);
+    map->insns_at_start = emit_note (NOTE_INSN_DELETED);
 
   map->regno_pointer_align = inl_f->emit->regno_pointer_align;
   map->x_regno_reg_rtx = inl_f->emit->x_regno_reg_rtx;
@@ -1304,7 +1304,7 @@ expand_inline_function (fndecl, parms, target, ignore, type,
      This line number note is still needed for debugging though, so we can't
      delete it.  */
   if (flag_test_coverage)
-    emit_note (NULL, NOTE_INSN_REPEATED_LINE_NUMBER);
+    emit_note (NOTE_INSN_REPEATED_LINE_NUMBER);
 
   emit_line_note (input_filename, input_line);
 
@@ -1689,7 +1689,7 @@ copy_insn_list (insns, map, static_chain_value)
 	      && NOTE_LINE_NUMBER (insn) != NOTE_INSN_FUNCTION_BEG
 	      && NOTE_LINE_NUMBER (insn) != NOTE_INSN_DELETED)
 	    {
-	      copy = emit_note (NULL, NOTE_LINE_NUMBER (insn));
+	      copy = emit_note (NOTE_LINE_NUMBER (insn));
 	      NOTE_DATA (copy) = NOTE_DATA (insn);
 	      if ((NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_BEG
 		   || NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_END)
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 5b3a359d606..ac7b6c3ea24 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -2671,7 +2671,7 @@ compensate_edge (e, file)
       start_sequence ();
 
       /* ??? change_stack needs some point to emit insns after.  */
-      after = emit_note (NULL, NOTE_INSN_DELETED);
+      after = emit_note (NOTE_INSN_DELETED);
 
       tmpstack = regstack;
       change_stack (after, &tmpstack, target_stack, EMIT_BEFORE);
diff --git a/gcc/reload1.c b/gcc/reload1.c
index bd9c0184ecf..2e641673585 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -669,7 +669,7 @@ reload (first, global)
 
   /* Make sure that the last insn in the chain
      is not something that needs reloading.  */
-  emit_note (NULL, NOTE_INSN_DELETED);
+  emit_note (NOTE_INSN_DELETED);
 
   /* Enable find_equiv_reg to distinguish insns made by reload.  */
   reload_first_uid = get_max_uid ();
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 98be2d0565d..52baa243875 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1541,7 +1541,7 @@ extern rtx emit_call_insn		PARAMS ((rtx));
 extern rtx emit_label			PARAMS ((rtx));
 extern rtx emit_barrier			PARAMS ((void));
 extern rtx emit_line_note		PARAMS ((const char *, int));
-extern rtx emit_note			PARAMS ((const char *, int));
+extern rtx emit_note			PARAMS ((int));
 extern rtx emit_line_note_force		PARAMS ((const char *, int));
 extern rtx make_insn_raw		PARAMS ((rtx));
 extern void add_function_usage_to       PARAMS ((rtx, rtx));
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index f23df4ed753..bfbcefda650 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -3838,7 +3838,7 @@ hoist_insn_to_edge (insn, e, val, new)
   if (e->insns == NULL_RTX)
     {
       start_sequence ();
-      emit_note (NULL, NOTE_INSN_DELETED);
+      emit_note (NOTE_INSN_DELETED);
     }
   else
     push_to_sequence (e->insns);
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 08f08db588b..39e41ff6dc5 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -918,11 +918,11 @@ expand_fixup (tree_label, rtl_label, last_insn)
 	  }
 
 	start_sequence ();
-	start = emit_note (NULL, NOTE_INSN_BLOCK_BEG);
+	start = emit_note (NOTE_INSN_BLOCK_BEG);
 	if (cfun->x_whole_function_mode_p)
 	  NOTE_BLOCK (start) = block;
-	fixup->before_jump = emit_note (NULL, NOTE_INSN_DELETED);
-	end = emit_note (NULL, NOTE_INSN_BLOCK_END);
+	fixup->before_jump = emit_note (NOTE_INSN_DELETED);
+	end = emit_note (NOTE_INSN_BLOCK_END);
 	if (cfun->x_whole_function_mode_p)
 	  NOTE_BLOCK (end) = block;
 	fixup->context = block;
@@ -2562,7 +2562,7 @@ expand_start_loop (exit_flag)
 
   do_pending_stack_adjust ();
   emit_queue ();
-  emit_note (NULL, NOTE_INSN_LOOP_BEG);
+  emit_note (NOTE_INSN_LOOP_BEG);
   emit_label (thisloop->data.loop.start_label);
 
   return thisloop;
@@ -2594,7 +2594,7 @@ expand_start_null_loop ()
   thisloop->next = loop_stack;
   thisloop->all = nesting_stack;
   thisloop->depth = ++nesting_depth;
-  thisloop->data.loop.start_label = emit_note (NULL, NOTE_INSN_DELETED);
+  thisloop->data.loop.start_label = emit_note (NOTE_INSN_DELETED);
   thisloop->data.loop.end_label = gen_label_rtx ();
   thisloop->data.loop.continue_label = thisloop->data.loop.end_label;
   thisloop->exit_label = thisloop->data.loop.end_label;
@@ -2613,7 +2613,7 @@ void
 expand_loop_continue_here ()
 {
   do_pending_stack_adjust ();
-  emit_note (NULL, NOTE_INSN_LOOP_CONT);
+  emit_note (NOTE_INSN_LOOP_CONT);
   emit_label (loop_stack->data.loop.continue_label);
 }
 
@@ -2765,7 +2765,7 @@ expand_end_loop ()
     }
 
   emit_jump (start_label);
-  emit_note (NULL, NOTE_INSN_LOOP_END);
+  emit_note (NOTE_INSN_LOOP_END);
   emit_label (loop_stack->data.loop.end_label);
 
   POPSTACK (loop_stack);
@@ -2800,7 +2800,7 @@ expand_continue_loop (whichloop)
 
   if (flag_guess_branch_prob)
     {
-      note = emit_note (NULL, NOTE_INSN_PREDICTION);
+      note = emit_note (NOTE_INSN_PREDICTION);
       NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_CONTINUE, IS_TAKEN);
     }
   clear_last_expr ();
@@ -2883,7 +2883,7 @@ expand_exit_loop_top_cond (whichloop, cond)
   if (! expand_exit_loop_if_false (whichloop, cond))
     return 0;
 
-  emit_note (NULL, NOTE_INSN_LOOP_END_TOP_COND);
+  emit_note (NOTE_INSN_LOOP_END_TOP_COND);
   return 1;
 }
 
@@ -3000,7 +3000,7 @@ expand_value_return (val)
       /* Emit information for branch prediction.  */
       rtx note;
 
-      note = emit_note (NULL, NOTE_INSN_PREDICTION);
+      note = emit_note (NOTE_INSN_PREDICTION);
 
       NOTE_PREDICTION (note) = NOTE_PREDICT (pred, NOT_TAKEN);
 
@@ -3420,11 +3420,11 @@ expand_start_bindings_and_block (flags, block)
   /* Create a note to mark the beginning of the block.  */
   if (block_flag)
     {
-      note = emit_note (NULL, NOTE_INSN_BLOCK_BEG);
+      note = emit_note (NOTE_INSN_BLOCK_BEG);
       NOTE_BLOCK (note) = block;
     }
   else
-    note = emit_note (NULL, NOTE_INSN_DELETED);
+    note = emit_note (NOTE_INSN_DELETED);
 
   /* Make an entry on block_stack for the block we are entering.  */
 
@@ -3445,7 +3445,7 @@ expand_start_bindings_and_block (flags, block)
      fix this is to just insert another instruction here, so that the
      instructions inserted after the last unconditional cleanup are
      never the last instruction.  */
-  emit_note (NULL, NOTE_INSN_DELETED);
+  emit_note (NOTE_INSN_DELETED);
 
   if (block_stack
       && !(block_stack->data.block.cleanups == NULL_TREE
@@ -3847,7 +3847,7 @@ expand_end_bindings (vars, mark_ends, dont_jump_in)
 
   if (mark_ends)
     {
-      rtx note = emit_note (NULL, NOTE_INSN_BLOCK_END);
+      rtx note = emit_note (NOTE_INSN_BLOCK_END);
       NOTE_BLOCK (note) = NOTE_BLOCK (thisblock->data.block.first_insn);
     }
   else
@@ -4189,7 +4189,7 @@ expand_decl_cleanup (decl, cleanup)
 	     fix this is to just insert another instruction here, so that the
 	     instructions inserted after the last unconditional cleanup are
 	     never the last instruction.  */
-	  emit_note (NULL, NOTE_INSN_DELETED);
+	  emit_note (NOTE_INSN_DELETED);
 	}
     }
   return 1;
@@ -4446,7 +4446,7 @@ expand_start_case (exit_flag, expr, type, printname)
   /* Make sure case_stmt.start points to something that won't
      need any transformation before expand_end_case.  */
   if (GET_CODE (get_last_insn ()) != NOTE)
-    emit_note (NULL, NOTE_INSN_DELETED);
+    emit_note (NOTE_INSN_DELETED);
 
   thiscase->data.case_stmt.start = get_last_insn ();
 
diff --git a/gcc/unroll.c b/gcc/unroll.c
index 2097e6e0e7b..03decb773df 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -2274,7 +2274,7 @@ copy_loop_body (loop, copy_start, copy_end, map, exit_label, last_iteration,
 		       || (last_iteration
 			   && unroll_type != UNROLL_COMPLETELY)))
 	    {
-	      copy = emit_note (NULL, NOTE_LINE_NUMBER (insn));
+	      copy = emit_note (NOTE_LINE_NUMBER (insn));
 	      NOTE_DATA (copy) = NOTE_DATA (insn);
 	    }
 	  else
@@ -2330,7 +2330,7 @@ copy_loop_body (loop, copy_start, copy_end, map, exit_label, last_iteration,
 		   && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_VTOP
 		   && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_CONT)
 	    {
-	      rtx copy = emit_note (NULL, NOTE_LINE_NUMBER (insn));
+	      rtx copy = emit_note (NOTE_LINE_NUMBER (insn));
 	      NOTE_DATA (copy) = NOTE_DATA (insn);
 	    }
 	}