summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2013-03-01 23:00:18 +0000
committerDJ Delorie <dj@delorie.com>2013-03-01 23:00:18 +0000
commit64bdc771f1d531ab21f8514bccadf2212c18e045 (patch)
tree8f889a901939fd85c75460fdaff387a02e771168
parent80b3bf00b820dee5495b64e84949bde4789db0af (diff)
downloadbinutils-redhat-64bdc771f1d531ab21f8514bccadf2212c18e045.tar.gz
merge from gcc
-rw-r--r--include/dwarf2.h14
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/libiberty.texi6
-rw-r--r--libiberty/obstacks.texi2
4 files changed, 11 insertions, 17 deletions
diff --git a/include/dwarf2.h b/include/dwarf2.h
index 120e2c16b4..e98505ac2f 100644
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -376,20 +376,6 @@ enum dwarf_macro_record_type
#define DW_EH_PE_indirect 0x80
-/* Codes for the debug sections in a dwarf package (.dwp) file.
- Extensions for Fission. See http://gcc.gnu.org/wiki/DebugFissionDWP. */
-enum dwarf_sect
- {
- DW_SECT_INFO = 1,
- DW_SECT_TYPES = 2,
- DW_SECT_ABBREV = 3,
- DW_SECT_LINE = 4,
- DW_SECT_LOC = 5,
- DW_SECT_STR_OFFSETS = 6,
- DW_SECT_MACINFO = 7,
- DW_SECT_MACRO = 8,
- DW_SECT_MAX = 8
- };
#ifdef __cplusplus
extern "C" {
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7935ad69f4..b4c61807b5 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-01 Andreas Schwab <schwab@linux-m68k.org>
+
+ * obstacks.texi (Obstacks): Trim @node to only contain the
+ node name.
+ * libiberty.texi (Obstacks): Lower section.
+
2013-02-14 Jason Merrill <jason@redhat.com>
* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_DEFAULT_ARG.
diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi
index 74f70d2bd5..f1e4bddaa8 100644
--- a/libiberty/libiberty.texi
+++ b/libiberty/libiberty.texi
@@ -82,8 +82,6 @@ License; for more information, see @ref{Library Copying}.
* Functions:: Available functions, macros, and global variables.
-* Obstacks:: Object Stacks.
-
* Licenses:: The various licenses under which libiberty sources are
distributed.
@@ -245,7 +243,11 @@ central location from which to use, maintain, and distribute them.
@c This is generated from the glibc manual using a make-obstacks-texi.sh
@c script of Phil's. Hope it's accurate.
+@lowersections
+@lowersections
@include obstacks.texi
+@raisesections
+@raisesections
@node Functions
@chapter Function, Variable, and Macro Listing.
diff --git a/libiberty/obstacks.texi b/libiberty/obstacks.texi
index a1b1b478c3..67780aa1a6 100644
--- a/libiberty/obstacks.texi
+++ b/libiberty/obstacks.texi
@@ -1,4 +1,4 @@
-@node Obstacks,Licenses,Functions,Top
+@node Obstacks
@chapter Obstacks
@cindex obstacks