summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-10-04 08:51:31 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-10-04 08:51:31 +0000
commitef34afc19c54b5ba436c4439906f2c0f7ee817ec (patch)
treea694463ed7d1b4928ebd657f78a634e247a46cdb /gcc
parentbd565b14d771c0ace8e64dbec0c28d5095ddb078 (diff)
downloadgcc-ef34afc19c54b5ba436c4439906f2c0f7ee817ec.tar.gz
2012-10-04 Arnaud Charlet <charlet@adacore.com>
* dumpfile.h, dumpfile.c: Remove TDI_ada. c-family/ * c-ada-spec.c (print_ada_declaration): Remove handling of TDF_RAW. * c.opt (-fdump-ada-spec, -fdump-ada-spec-slim): Move switch definition out of dumpfile.h. c/ * c-decl.c (c_write_global_declarations): Fix handling of -fdump-ada-spec*. cp/ * decl2.c (cp_write_global_declarations): Fix handling of -fdump-ada-spec*. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192067 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/c-family/ChangeLog8
-rw-r--r--gcc/c-family/c-ada-spec.c7
-rw-r--r--gcc/c-family/c.opt8
-rw-r--r--gcc/c/ChangeLog5
-rw-r--r--gcc/c/c-decl.c4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c4
-rw-r--r--gcc/dumpfile.c3
-rw-r--r--gcc/dumpfile.h1
10 files changed, 36 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7006437fa6..dd6a3b8e0ab 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-04 Arnaud Charlet <charlet@adacore.com>
+
+ * dumpfile.h, dumpfile.c: Remove TDI_ada.
+
2012-10-04 Yuri Rumyantsev <ysrumyan@gmail.com>
* config/i386/i386.c (ix86_dep_by_shift_count_body) : Add
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index c26014ec469..0d112cfe7a7 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,7 +1,13 @@
+2012-10-04 Arnaud Charlet <charlet@adacore.com>
+
+ * c-ada-spec.c (print_ada_declaration): Remove handling of TDF_RAW.
+ * c.opt (-fdump-ada-spec, -fdump-ada-spec-slim): Move switch definition
+ out of dumpfile.h.
+
2012-09-25 Dehao Chen <dehao@google.com>
PR middle-end/54645
- * c-family/c-pch.c (c_common_read_pch): Rebuild the location_adhoc_data
+ * c-pch.c (c_common_read_pch): Rebuild the location_adhoc_data
map when read in the pch.
2012-09-18 Arnaud Charlet <charlet@adacore.com>
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 1e27e2c1e25..4f38a63ad89 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -2535,7 +2535,6 @@ print_ada_declaration (pretty_printer *buffer, tree t, tree type,
int is_class = false;
tree name = TYPE_NAME (TREE_TYPE (t));
tree decl_name = DECL_NAME (t);
- bool dump_internal = get_dump_file_info (TDI_ada)->pflags & TDF_RAW;
tree orig = NULL_TREE;
if (cpp_check && cpp_check (t, IS_TEMPLATE))
@@ -2705,8 +2704,7 @@ print_ada_declaration (pretty_printer *buffer, tree t, tree type,
}
else
{
- if (!dump_internal
- && TREE_CODE (t) == VAR_DECL
+ if (TREE_CODE (t) == VAR_DECL
&& decl_name
&& *IDENTIFIER_POINTER (decl_name) == '_')
return 0;
@@ -2796,8 +2794,7 @@ print_ada_declaration (pretty_printer *buffer, tree t, tree type,
/* If this function has an entry in the dispatch table, we cannot
omit it. */
- if (!dump_internal && !DECL_VINDEX (t)
- && *IDENTIFIER_POINTER (decl_name) == '_')
+ if (!DECL_VINDEX (t) && *IDENTIFIER_POINTER (decl_name) == '_')
{
if (IDENTIFIER_POINTER (decl_name)[1] == '_')
return 0;
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 6aa53a57744..b02c515327c 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -799,6 +799,14 @@ fdollars-in-identifiers
C ObjC C++ ObjC++
Permit '$' as an identifier character
+fdump-ada-spec
+C ObjC C++ ObjC++ RejectNegative Var(flag_dump_ada_spec)
+Write all declarations as Ada code transitively
+
+fdump-ada-spec-slim
+C ObjC C++ ObjC++ RejectNegative Var(flag_dump_ada_spec_slim)
+Write all declarations as Ada code for the given file only
+
felide-constructors
C++ ObjC++ Var(flag_elide_constructors) Init(1)
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 770683c6ab5..257b752cca4 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04 Arnaud Charlet <charlet@adacore.com>
+
+ * c-decl.c (c_write_global_declarations): Fix handling of
+ -fdump-ada-spec*.
+
2012-09-30 Sharad Singhai <singhai@google.com>
* c-decl.c (c_write_global_declarations): Use a different method
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 1b4d764ca49..a4a8108d279 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -10079,10 +10079,10 @@ c_write_global_declarations (void)
gcc_assert (!current_scope);
/* Handle -fdump-ada-spec[-slim]. */
- if (dump_initialized_p (TDI_ada))
+ if (flag_dump_ada_spec || flag_dump_ada_spec_slim)
{
/* Build a table of files to generate specs for */
- if (get_dump_file_info (TDI_ada)->pflags & TDF_SLIM)
+ if (flag_dump_ada_spec_slim)
collect_source_ref (main_input_filename);
else
for_each_global_decl (collect_source_ref_cb);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 223e42a0d4c..fe72a9ca7e4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04 Arnaud Charlet <charlet@adacore.com>
+
+ * decl2.c (cp_write_global_declarations): Fix handling of
+ -fdump-ada-spec*.
+
2012-10-03 Jakub Jelinek <jakub@redhat.com>
PR c++/54777
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9b1a5a1856d..87e38d3bf6f 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3698,9 +3698,9 @@ cp_write_global_declarations (void)
cgraph_process_same_body_aliases ();
/* Handle -fdump-ada-spec[-slim] */
- if (dump_initialized_p (TDI_ada))
+ if (flag_dump_ada_spec || flag_dump_ada_spec_slim)
{
- if (get_dump_file_info (TDI_ada)->pflags & TDF_SLIM)
+ if (flag_dump_ada_spec_slim)
collect_source_ref (main_input_filename);
else
collect_source_refs (global_namespace);
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 92d1409be08..2f610b6c259 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -57,8 +57,7 @@ static struct dump_file_info dump_files[TDI_end] =
0, 0, 0, 5},
{".vcg", "tree-vcg", NULL, NULL, NULL, NULL, NULL, TDF_TREE,
0, 0, 0, 6},
- {".ads", "ada-spec", NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 7},
-#define FIRST_AUTO_NUMBERED_DUMP 8
+#define FIRST_AUTO_NUMBERED_DUMP 7
{NULL, "tree-all", NULL, NULL, NULL, NULL, NULL, TDF_TREE,
0, 0, 0, 0},
diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h
index cbaf47de422..87a2c728623 100644
--- a/gcc/dumpfile.h
+++ b/gcc/dumpfile.h
@@ -37,7 +37,6 @@ enum tree_dump_index
TDI_nested, /* dump each function after unnesting it */
TDI_vcg, /* create a VCG graph file for each
function's flowgraph. */
- TDI_ada, /* dump declarations in Ada syntax. */
TDI_tree_all, /* enable all the GENERIC/GIMPLE dumps. */
TDI_rtl_all, /* enable all the RTL dumps. */
TDI_ipa_all, /* enable all the IPA dumps. */
View Lorry Controller Status