This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: PATCH: Support VER_FLG_INFO in readelf
Ian Lance Taylor <iant@google.com> writes:
> I suppose the changes to elfcpp and gold are OK. They seem kind of
> useless, though, since the is_info_ field will never be set to true.
> What would you expect to cause that field to be true?
>
> Please do verify that the code compiles before committing it.
It does, though gold/incremental.cc fails to compile on
sparc-sun-solaris2.10:
/vol/src/gnu/binutils/binutils/gold/incremental.cc: In function 'void gold::vexplain_no_incremental(const char*, void*)':
/vol/src/gnu/binutils/binutils/gold/incremental.cc:47: error: 'vasprintf' was not declared in this scope
Below is the patch I've installed.
Thanks.
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
2010-02-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
include:
* elf/common.h (VER_FLG_*): Document.
(VER_FLG_INFO): Define.
gold:
* dynobj.h (Verdef::Verdef): Add is_info arg, is_info member
function, is_info_ member.
* dynobj.cc (Verdef::write): Set VER_FLG_INFO if this->is_info_.
(Versions::Versions): Update caller.
(Versions::define_base_version): Likewise.
(Versions::add_def): Likewise.
elfcpp:
* elfcpp.h (VER_FLG_INFO): Define.
binutils:
* readelf.c (get_ver_flags): Handle VER_FLG_INFO.
Index: binutils/readelf.c
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.487
diff -u -p -r1.487 readelf.c
--- binutils/readelf.c 2 Mar 2010 16:44:34 -0000 1.487
+++ binutils/readelf.c 5 Mar 2010 19:55:07 -0000
@@ -7267,7 +7267,15 @@ get_ver_flags (unsigned int flags)
strcat (buff, "WEAK ");
}
- if (flags & ~(VER_FLG_BASE | VER_FLG_WEAK))
+ if (flags & VER_FLG_INFO)
+ {
+ if (flags & (VER_FLG_BASE|VER_FLG_WEAK))
+ strcat (buff, "| ");
+
+ strcat (buff, "INFO ");
+ }
+
+ if (flags & ~(VER_FLG_BASE | VER_FLG_WEAK | VER_FLG_INFO))
strcat (buff, "| <unknown>");
return buff;
Index: elfcpp/elfcpp.h
===================================================================
RCS file: /cvs/src/src/elfcpp/elfcpp.h,v
retrieving revision 1.29
diff -u -p -r1.29 elfcpp.h
--- elfcpp/elfcpp.h 19 Jan 2010 17:55:49 -0000 1.29
+++ elfcpp/elfcpp.h 5 Mar 2010 19:55:07 -0000
@@ -1,6 +1,6 @@
// elfcpp.h -- main header file for elfcpp -*- C++ -*-
-// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of elfcpp.
@@ -784,6 +784,7 @@ const int VER_NEED_CURRENT = 1;
const int VER_FLG_BASE = 0x1;
const int VER_FLG_WEAK = 0x2;
+const int VER_FLG_INFO = 0x4;
// Special constants found in the SHT_GNU_versym entries.
Index: gold/dynobj.cc
===================================================================
RCS file: /cvs/src/src/gold/dynobj.cc,v
retrieving revision 1.56
diff -u -p -r1.56 dynobj.cc
--- gold/dynobj.cc 12 Jan 2010 06:41:36 -0000 1.56
+++ gold/dynobj.cc 5 Mar 2010 19:55:17 -0000
@@ -1221,7 +1221,8 @@ Verdef::write(const Stringpool* dynpool,
elfcpp::Verdef_write<size, big_endian> vd(pb);
vd.set_vd_version(elfcpp::VER_DEF_CURRENT);
vd.set_vd_flags((this->is_base_ ? elfcpp::VER_FLG_BASE : 0)
- | (this->is_weak_ ? elfcpp::VER_FLG_WEAK : 0));
+ | (this->is_weak_ ? elfcpp::VER_FLG_WEAK : 0)
+ | (this->is_info_ ? elfcpp::VER_FLG_INFO : 0));
vd.set_vd_ndx(this->index());
vd.set_vd_cnt(1 + this->deps_.size());
vd.set_vd_hash(Dynobj::elf_hash(this->name()));
@@ -1353,7 +1354,7 @@ Versions::Versions(const Version_script_
Verdef* const vd = new Verdef(
version,
this->version_script_.get_dependencies(version),
- false, false, false);
+ false, false, false, false);
this->defs_.push_back(vd);
Key key(version_key, 0);
this->version_table_.insert(std::make_pair(key, vd));
@@ -1391,7 +1392,7 @@ Versions::define_base_version(Stringpool
name = parameters->options().output_file_name();
name = dynpool->add(name, false, NULL);
Verdef* vdbase = new Verdef(name, std::vector<std::string>(),
- true, false, true);
+ true, false, false, true);
this->defs_.push_back(vdbase);
this->needs_base_version_ = false;
}
@@ -1474,7 +1475,7 @@ Versions::add_def(const Symbol* sym, con
// When creating a regular executable, automatically define
// a new version.
Verdef* vd = new Verdef(version, std::vector<std::string>(),
- false, false, false);
+ false, false, false, false);
this->defs_.push_back(vd);
ins.first->second = vd;
}
Index: gold/dynobj.h
===================================================================
RCS file: /cvs/src/src/gold/dynobj.h,v
retrieving revision 1.37
diff -u -p -r1.37 dynobj.h
--- gold/dynobj.h 5 Jan 2010 21:52:51 -0000 1.37
+++ gold/dynobj.h 5 Mar 2010 19:55:17 -0000
@@ -360,9 +360,9 @@ class Verdef : public Version_base
{
public:
Verdef(const char* name, const std::vector<std::string>& deps,
- bool is_base, bool is_weak, bool is_symbol_created)
+ bool is_base, bool is_weak, bool is_info, bool is_symbol_created)
: name_(name), deps_(deps), is_base_(is_base), is_weak_(is_weak),
- is_symbol_created_(is_symbol_created)
+ is_info_(is_info), is_symbol_created_(is_symbol_created)
{ }
// Return the version name.
@@ -391,6 +391,11 @@ class Verdef : public Version_base
clear_weak()
{ this->is_weak_ = false; }
+ // Return whether this definition is informational.
+ bool
+ is_info() const
+ { return this->is_info_; }
+
// Return whether a version symbol has been created for this
// definition.
bool
@@ -419,6 +424,8 @@ class Verdef : public Version_base
bool is_base_;
// Whether this version is weak.
bool is_weak_;
+ // Whether this version is informational.
+ bool is_info_;
// Whether a version symbol has been created.
bool is_symbol_created_;
};
Index: include/elf/common.h
===================================================================
RCS file: /cvs/src/src/include/elf/common.h,v
retrieving revision 1.121
diff -u -p -r1.121 common.h
--- include/elf/common.h 9 Feb 2010 12:14:43 -0000 1.121
+++ include/elf/common.h 5 Mar 2010 19:55:17 -0000
@@ -812,10 +812,16 @@
#define VER_DEF_CURRENT 1
/* These constants appear in the vd_flags field of a Elf32_Verdef
- structure. */
+ structure.
+
+ Cf. the Solaris Linker and Libraries Guide, Ch. 7, Object File Format,
+ Versioning Sections, for a description:
+
+ http://docs.sun.com/app/docs/doc/819-0690/chapter6-93046?l=en&a=view */
#define VER_FLG_BASE 0x1
#define VER_FLG_WEAK 0x2
+#define VER_FLG_INFO 0x4
/* These special constants can be found in an Elf32_Versym field. */