diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab6875e977f..1f170a6d56f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-23  Jason Merrill  <jason@redhat.com>
 
+	* gdbinit.in (input_line, input_filename): Define.
+
 	* cgraph.h (struct cgraph_node): Add calls_comdat_local.
 	(symtab_comdat_local_p, symtab_in_same_comdat_p): New.
 	* cif-code.def: Add USES_COMDAT_LOCAL.
diff --git a/gcc/gdbinit.in b/gcc/gdbinit.in
index aa0bf9beda6..79361a5bfd1 100644
--- a/gcc/gdbinit.in
+++ b/gcc/gdbinit.in
@@ -195,6 +195,8 @@ macro define __FILE__ "gdb"
 macro define __LINE__ 1
 macro define __FUNCTION__ "gdb"
 macro define __null 0
+macro define input_line expand_location(input_location).line
+macro define input_filename expand_location(input_location).file
 
 # Gracefully handle aborts in functions used from gdb.
 set unwindonsignal on