]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'master' into portable
authorMark Wielaard <mjw@redhat.com>
Mon, 25 Aug 2014 20:25:37 +0000 (22:25 +0200)
committerMark Wielaard <mjw@redhat.com>
Mon, 25 Aug 2014 20:25:37 +0000 (22:25 +0200)
14 files changed:
1  2 
ChangeLog
backends/ChangeLog
config/ChangeLog
configure.ac
libdw/ChangeLog
libdw/libdw.h
libdwfl/ChangeLog
libdwfl/linux-core-attach.c
libdwfl/linux-pid-attach.c
libebl/ChangeLog
libelf/ChangeLog
src/ChangeLog
tests/ChangeLog
tests/backtrace.c

diff --cc ChangeLog
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
diff --cc libdw/ChangeLog
Simple merge
diff --cc libdw/libdw.h
Simple merge
Simple merge
index 981086ee9347181d1487378468dea6116f5e0f64,5a7b3b3daad76d149c7241c817750280106a6353..d05ac7e0a820487c227089702a67d327b4a21dff
  #include "libdwflP.h"
  #include <fcntl.h>
  #include "system.h"
 +#include <endian.h>
 +#include <byteswap.h>
 +#if __BYTE_ORDER == __LITTLE_ENDIAN
 +# ifndef be64toh
 +#  define be64toh(x) bswap_64 (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) bswap_32 (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) (x)
 +# endif
 +#else
 +# ifndef be64toh
 +#  define be64toh(x) (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) bswap_64 (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) bswap_32 (x)
 +# endif
 +#endif
  
+ #include "../libdw/memory-access.h"
  #ifndef MIN
  # define MIN(a, b) ((a) < (b) ? (a) : (b))
  #endif
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc tests/ChangeLog
Simple merge
Simple merge