4.7.0-0.2

This commit is contained in:
Jakub Jelinek 2012-01-03 15:31:26 +01:00
parent 5c29a25740
commit a539bf4094
1 changed files with 5 additions and 5 deletions

View File

@ -70,7 +70,7 @@
struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
--- gcc/dwarf2out.c.jj 2011-01-03 12:53:05.102056475 +0100 --- gcc/dwarf2out.c.jj 2011-01-03 12:53:05.102056475 +0100
+++ gcc/dwarf2out.c 2011-01-04 18:03:14.534151763 +0100 +++ gcc/dwarf2out.c 2011-01-04 18:03:14.534151763 +0100
@@ -17650,9 +17650,18 @@ add_bit_size_attribute (dw_die_ref die, @@ -15793,9 +15793,18 @@ add_bit_size_attribute (dw_die_ref die,
static inline void static inline void
add_prototyped_attribute (dw_die_ref die, tree func_type) add_prototyped_attribute (dw_die_ref die, tree func_type)
{ {
@ -92,10 +92,10 @@
} }
/* Add an 'abstract_origin' attribute below a given DIE. The DIE is found /* Add an 'abstract_origin' attribute below a given DIE. The DIE is found
@@ -19875,6 +19884,10 @@ gen_compile_unit_die (const char *filena @@ -18438,6 +18447,10 @@ gen_compile_unit_die (const char *filena
language = DW_LANG_ObjC; if (strcmp (language_string, "GNU Go") == 0)
else if (strcmp (language_string, "GNU Objective-C++") == 0) language = DW_LANG_Go;
language = DW_LANG_ObjC_plus_plus; }
+ else if (strcmp (language_string, "GNU C") == 0 + else if (strcmp (language_string, "GNU C") == 0
+ && lang_hooks.source_language + && lang_hooks.source_language
+ && lang_hooks.source_language () >= 1999) + && lang_hooks.source_language () >= 1999)