Pull request for branch for-2012.05/valgrind-fix
The following changes since commit a4ee7179e692bdded8b98c54dd484b17098c695d:
Added the empty package (2012-05-06 10:01:35 +0200)
are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git for-2012.05/valgrind-fix
for you to fetch changes up to 92316b7267b614887d3186bcb585dc39206b0a85:
valgrind: fix build on PowerPC/uClibc (2012-05-06 11:38:30 +0200)
----------------------------------------------------------------
Thomas Petazzoni (1):
valgrind: fix build on PowerPC/uClibc
.../valgrind-3.7.0-dont-include-a-out-header.patch | 45 ++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/1 valgrind: fix build on PowerPC/uClibc
Fixes build failures like
http://autobuild.buildroot.org/results/112fa7c56e1e31c9a81d5f27394f58789e36bfec/build-end.log.
--- .../valgrind-3.7.0-dont-include-a-out-header.patch | 45 ++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch new file +45 -0
@@ -0,0 +1,45 @@ +Add replacement for <a.out.h> + +Valgrind includes <a.out.h> to get the definition of 'struct +nlist'. However, while glibc directly defines 'struct nlist' in +<a.out.h>, uClibc relies on it being defined by kernel headers (i.e +<a.out.h> simply includes <linux/a.out.h>). This works for most +architectures, but not for PowerPC, on which the a.out binary format +has never been supported, and therefore the <linux/a.out.h> kernel +header does not exist. + +One solution would have been to use the <nlist.h> header, but this one +is only available in glibc, and it also has a slightly different +definition than the one in <a.out.h>. So, for the time being, the +easiest solution is to just replace the #include <a.out.h> in Valgrind +code by a copy/paste of the 'struct nlist' definition. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: b/coregrind/m_debuginfo/readstabs.c +=================================================================== +--- a/coregrind/m_debuginfo/readstabs.c ++++ b/coregrind/m_debuginfo/readstabs.c +@@ -52,7 +52,21 @@ + + /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */ + #if defined(VGO_linux) +-# include <a.out.h> /* stabs defns */ ++/* Copied from a.out.h, because it is otherwise not available on ++ PowerPC/uClibc */ ++struct nlist ++{ ++ union ++ { ++ char *n_name; ++ struct nlist *n_next; ++ long n_strx; ++ } n_un; ++ unsigned char n_type; ++ char n_other; ++ short n_desc; ++ unsigned long n_value; ++}; + #elif defined(VGO_darwin) + # include <mach-o/nlist.h> + # define n_other n_sect
Signature · 1 line
1.7.9.5
PATCH 1/1 valgrind: fix build on PowerPC/uClibc
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Fixes build failures like
Thomas> http://autobuild.buildroot.org/results/112fa7c56e1e31c9a81d5f27394f58789e36bfec/build-end.log.
Great, committed - Thanks.
Signature · 1 line
Bye, Peter Korsgaard