summaryrefslogtreecommitdiffstats
path: root/libelf
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2017-08-16 16:37:34 +0200
committerUlf Hermann <[email protected]>2017-08-17 17:55:41 +0200
commitd86c13d143989a961eba149e3abfab9e3f471744 (patch)
treec16c260c24712819cb967415ec79e58e26d3e4bf /libelf
parent3695a1ba8dcd16459e0f35b74e88dbef48d21861 (diff)
parent54ba4ce2973113d8f4315d4fc90e16a9b4476ea6 (diff)
Merge tag 'elfutils-0.170'
elfutils 0.170 release Change-Id: I37d03645902b9f0a9fb708af1551db8843537799
Diffstat (limited to 'libelf')
-rw-r--r--libelf/ChangeLog12
-rw-r--r--libelf/Makefile.am14
-rw-r--r--libelf/elf.h1
3 files changed, 22 insertions, 5 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index e6cc3eaa..f83f68dd 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -29,6 +29,18 @@
* Makefile.am: Link libelf agaist libgnu.a if requested.
+2017-07-19 Gustavo Romero <[email protected]>
+
+ * elf.h: Add known type in notes segment descriptor for HTM SPRs.
+
+2017-02-17 Ulf hermann <[email protected]>
+
+ * Makefile.am: Add libelf_so_DEPS, which include libeu.a,
+ libelf_so_LIBS.
+ (libelf_so_LDLIBS): Add $(libelf_so_DEPS).
+ (libelf.so$(EXEEXT): Use $(libelf_so_LIBS), require libelf.map
+ from the right directory.
+
2017-04-20 Ulf Hermann <[email protected]>
* libelfP.h: Don't include config.h.
diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 1a2b85a9..946c09c4 100644
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -94,7 +94,8 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \
libelf_pic_a_SOURCES =
am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
-libelf_so_LDLIBS = -lz $(intl_LDADD)
+libelf_so_DEPS = ../lib/libeu.a
+libelf_so_LDLIBS = $(libelf_so_DEPS) -lz $(intl_LDADD)
if USE_LOCKS
libelf_so_LDLIBS += -lpthread
endif
@@ -108,10 +109,13 @@ else
GEN_DEF =
endif
-$(libelf_BARE): libelf_pic.a libelf.map
- $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
- -Wl,--soname,$(libelf_SONAME) $(GEN_DEF) $(libelf_so_LDLIBS)
+libelf_so_LIBS = libelf_pic.a
+$(libelf_BARE): $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS)
+ $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
+ -Wl,--soname,$(libelf_SONAME) $(GEN_DEF) \
+ -Wl,--version-script,$<,--no-undefined \
+ -Wl,--whole-archive $(libelf_so_LIBS) -Wl,--no-whole-archive \
+ $(libelf_so_LDLIBS)
@$(textrel_check)
$(AM_V_at)ln -fs $@ $(libelf_SONAME)
diff --git a/libelf/elf.h b/libelf/elf.h
index ba385d38..1c331b44 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -765,6 +765,7 @@ typedef struct
#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */
#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */
#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */
+#define NT_PPC_TM_SPR 0x10c /* PowerPC HW Transactional Memory SPRs */
#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */
#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */
#define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */