aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorBasile Starynkevitch <basile@starynkevitch.net>2010-10-19 06:47:02 +0000
committerBasile Starynkevitch <bstarynk@gcc.gnu.org>2010-10-19 06:47:02 +0000
commitc512a6a0e69aef4e42a057209124ed11f4f9ef55 (patch)
tree87958293bccb5bc1c6f33474ab58e6e9a6ac88c6 /gcc
parent5c822194254910c3a04cf470a9a6469958447c1f (diff)
downloadgcc-c512a6a0e69aef4e42a057209124ed11f4f9ef55.zip
gcc-c512a6a0e69aef4e42a057209124ed11f4f9ef55.tar.gz
gcc-c512a6a0e69aef4e42a057209124ed11f4f9ef55.tar.bz2
gengtype.c (new_structure): Remove ad-hoc "location_s" processing.
2010-10-19 Basile Starynkevitch <basile@starynkevitch.net> * gengtype.c (new_structure): Remove ad-hoc "location_s" processing. From-SVN: r165679
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gengtype.c20
2 files changed, 4 insertions, 20 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d044941..4ec40f8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-19 Basile Starynkevitch <basile@starynkevitch.net>
+ * gengtype.c (new_structure): Remove ad-hoc "location_s"
+ processing.
+
2010-10-18 Richard Henderson <rth@redhat.com>
* simplify-rtx.c (simplify_ternary_operation) [FMA]: Simplify
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 38189ae..e0ebef4 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -689,12 +689,6 @@ new_structure (const char *name, int isunion, struct fileloc *pos,
type_p s = NULL;
lang_bitmap bitmap = get_lang_bitmap (pos->file);
- /* temporary kludge - gengtype doesn't handle conditionals or
- macros. Ignore any attempt to define struct location_s, unless
- it is coming from this file (main() sets it up safely). */
- if (!strcmp (name, "location_s") && !isunion && pos->file != this_file)
- return find_structure (name, 0);
-
for (si = structures; si != NULL; si = si->next)
if (strcmp (name, si->u.s.tag) == 0 && UNION_P (si) == isunion)
{
@@ -756,20 +750,6 @@ new_structure (const char *name, int isunion, struct fileloc *pos,
if (s->u.s.lang_struct)
s->u.s.lang_struct->u.s.bitmap |= bitmap;
- /* Reset location_s's location to input.h so that we know where to
- write out its mark routine. */
- if (!strcmp (name, "location_s") && !isunion && pos->file == this_file)
- {
- size_t n;
- for (n = 0; n < num_gt_files; n++)
- if (!strcmp (gt_files[n] + strlen (gt_files[n]) - strlen ("input.h"),
- "input.h"))
- {
- s->u.s.line.file = gt_files[n];
- break;
- }
- }
-
return s;
}