1 files changed, 0 insertions, 41 deletions
diff --git a/libcpp/ChangeLog.google-4_7 b/libcpp/ChangeLog.google-4_7
deleted file mode 100644
index c22da8b8d9b..00000000000
--- a/libcpp/ChangeLog.google-4_7
+++ /dev/null
@@ -1,41 +0,0 @@
-2012-09-27  Dehao Chen  <dehao@google.com>
-
-	Backport from trunk r191494, r191510, r191614, r191669, r191680,
-	r191706, r191747, r191759, r191779 and r191810:
-
-	* include/line-map.h (MAX_SOURCE_LOCATION): New value.
-	(location_adhoc_data_fini): New.
-	(get_combined_adhoc_loc): New.
-	(get_data_from_adhoc_loc): New.
-	(get_location_from_adhoc_loc): New.
-	(location_adhoc_data_map): New.
-	(COMBINE_LOCATION_DATA): New.
-	(IS_ADHOC_LOC): New.
-	(expanded_location): New field.
-	(line_maps): New field.
-	* line-map.c (location_adhoc_data): New.
-	(location_adhoc_data_hash): New.
-	(location_adhoc_data_eq): New.
-	(location_adhoc_data_update): New.
-	(get_combined_adhoc_loc): New.
-	(get_data_from_adhoc_loc): New.
-	(get_location_from_adhoc_loc): New.
-	(location_adhoc_data_fini): New.
-	(rebuild_location_adhoc_htab): New.
-	(linemap_init): Initialize location_adhoc_data.
-	(linemap_line_start): Change to use new location.
-	(linemap_position_for_line_and_column): Likewise.
-	(linemap_lookup): Likewise.
-	(linemap_ordinary_map_lookup): Likewise.
-	(linemap_macro_map_lookup): Likewise.
-	(linemap_get_expansion_line): Likewise.
-	(linemap_get_expansion_filename): Likewise.
-	(linemap_location_in_system_header_p): Likewise.
-	(linemap_location_from_macro_expansion_p): Likewise.
-	(linemap_macro_loc_to_spelling_point): Likewise.
-	(linemap_macro_loc_to_def_point): Likewise.
-	(linemap_macro_loc_to_exp_point): Likewise.
-	(linemap_resolve_location): Likewise.
-	(linemap_unwind_toward_expansion): Likewise.
-	(linemap_expand_location): Likewise.
-	(linemap_dump_location): Likewise.