summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2010-11-03 02:31:02 +0000
committerH.J. Lu <hjl.tools@gmail.com>2010-11-03 02:31:02 +0000
commit6b6bc957dd8c070845cda722223573c6bc363a10 (patch)
tree855cbfb11d2b2baffbb0ecf906a32a4b6520b7aa
parente9ed54eec6395626d8288f79557c6181af4f7cb5 (diff)
downloadbinutils-gdb-6b6bc957dd8c070845cda722223573c6bc363a10.tar.gz
Don't display bits only used for BFD in abfd->flags.
bfd/ 2010-11-02 H.J. Lu <hongjiu.lu@intel.com> * bfd.c (BFD_FLAGS_FOR_BFD_USE_MASK): New. * bfd-in2.h: Regenerated. binutils/ 2010-11-02 H.J. Lu <hongjiu.lu@intel.com> * objdump.c (dump_bfd_header): Don't display BFD_FLAGS_FOR_BFD_USE_MASK bits in abfd->flags.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/bfd-in2.h5
-rw-r--r--bfd/bfd.c5
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/objdump.c2
5 files changed, 21 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3538ef5dc9a..24d096b4674 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * bfd.c (BFD_FLAGS_FOR_BFD_USE_MASK): New.
+ * bfd-in2.h: Regenerated.
+
2010-11-02 Joseph Myers <joseph@codesourcery.com>
* elf32-tic6x.c (elf32_tic6x_obj_attrs_arg_type): Except for
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index aec5c24d4e7..c6a54b5acbe 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5081,6 +5081,11 @@ struct bfd
#define BFD_FLAGS_SAVED \
(BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS)
+ /* Flags bits which are for BFD use only. */
+#define BFD_FLAGS_FOR_BFD_USE_MASK \
+ (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \
+ | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT)
+
/* Currently my_archive is tested before adding origin to
anything. I believe that this can become always an add of
origin, with origin set to 0 for non archive files. */
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 3b2960320d8..a9ce7cc226b 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -161,6 +161,11 @@ CODE_FRAGMENT
.#define BFD_FLAGS_SAVED \
. (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS)
.
+. {* Flags bits which are for BFD use only. *}
+.#define BFD_FLAGS_FOR_BFD_USE_MASK \
+. (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \
+. | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT)
+.
. {* Currently my_archive is tested before adding origin to
. anything. I believe that this can become always an add of
. origin, with origin set to 0 for non archive files. *}
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8acf57e1d64..3ecc5fb6271 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-02 H.J. Lu <hongjiu.lu@intel.com>
+
+ * objdump.c (dump_bfd_header): Don't display
+ BFD_FLAGS_FOR_BFD_USE_MASK bits in abfd->flags.
+
2010-11-02 Joseph Myers <joseph@codesourcery.com>
* readelf.c (display_tic6x_attribute): Handle more attributes.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 5f996e682d4..c672f15c660 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2562,7 +2562,7 @@ dump_bfd_header (bfd *abfd)
printf (_("architecture: %s, "),
bfd_printable_arch_mach (bfd_get_arch (abfd),
bfd_get_mach (abfd)));
- printf (_("flags 0x%08x:\n"), abfd->flags);
+ printf (_("flags 0x%08x:\n"), abfd->flags & ~BFD_FLAGS_FOR_BFD_USE_MASK);
#define PF(x, y) if (abfd->flags & x) {printf("%s%s", comma, y); comma=", ";}
PF (HAS_RELOC, "HAS_RELOC");