summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordavidxl <davidxl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-09 04:27:12 +0000
committerdavidxl <davidxl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-09 04:27:12 +0000
commitcaf1dad8282306efa3c509b82bb6c317aef7a278 (patch)
treeedbc4150d05f3cf71c95db9bbd3853f1b91769d3 /include
parentb9dc835879f335c92052bd79dbe7dc91f823e92e (diff)
downloadgcc-caf1dad8282306efa3c509b82bb6c317aef7a278.tar.gz
Merge from trunk: 151232-151394
Note with this merge, several SPEC06 benchmarks are broken which I believe is due to problems in trunk: 1. xalanbmk -- link time unsat in profile-gen pass. The problem is that the thunk alias label is never emitted because the virtual function is DFEed. However the thunk itself is still emitted which references the alias label. This seems to be caused by the trunk change that push thunk emission to be much earlier. 2. soplex -- link time unsat in profile use pass -- not triaged. 3. dealII -- compiler ice git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/lw-ipo@151547 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
-rw-r--r--include/demangle.h2
-rw-r--r--include/dwarf2.h6
-rw-r--r--include/hashtab.h3
-rw-r--r--include/splay-tree.h3
4 files changed, 11 insertions, 3 deletions
diff --git a/include/demangle.h b/include/demangle.h
index 0bcae2fdbbb..4b3565bfbb8 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -1,6 +1,6 @@
/* Defs for interface to demanglers.
Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
- 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License
diff --git a/include/dwarf2.h b/include/dwarf2.h
index 295abf5c0ce..befaceb7ebe 100644
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -210,6 +210,9 @@ enum dwarf_tag
DW_TAG_class_template = 0x4103, /* For C++. */
DW_TAG_GNU_BINCL = 0x4104,
DW_TAG_GNU_EINCL = 0x4105,
+ /* Template template parameter.
+ See http://gcc.gnu.org/wiki/TemplateParmsDwarf . */
+ DW_TAG_GNU_template_template_param = 0x4106,
/* Extensions for UPC. See: http://upc.gwu.edu/~upc. */
DW_TAG_upc_shared_type = 0x8765,
DW_TAG_upc_strict_type = 0x8766,
@@ -390,6 +393,9 @@ enum dwarf_attribute
DW_AT_body_begin = 0x2105,
DW_AT_body_end = 0x2106,
DW_AT_GNU_vector = 0x2107,
+ /* Template template argument name.
+ See http://gcc.gnu.org/wiki/TemplateParmsDwarf . */
+ DW_AT_GNU_template_name = 0x2110,
/* VMS extensions. */
DW_AT_VMS_rtnbeg_pd_address = 0x2201,
/* UPC extension. */
diff --git a/include/hashtab.h b/include/hashtab.h
index 4f67448a9af..1cd406daf31 100644
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -1,5 +1,6 @@
/* An expandable hash tables datatype.
- Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2009
+ Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@cygnus.com).
This program is free software; you can redistribute it and/or modify
diff --git a/include/splay-tree.h b/include/splay-tree.h
index 8f236e09ccf..8a56a20cdc3 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -1,5 +1,6 @@
/* A splay-tree datatype.
- Copyright 1998, 1999, 2000, 2002, 2007 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2002, 2005, 2007, 2009
+ Free Software Foundation, Inc.
Contributed by Mark Mitchell (mark@markmitchell.com).
This file is part of GCC.