diff options
| author | Ulf Hermann <[email protected]> | 2017-05-08 15:28:09 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2017-05-08 15:55:12 +0200 |
| commit | 3695a1ba8dcd16459e0f35b74e88dbef48d21861 (patch) | |
| tree | 674d0dc13f0065f81e7f672e81fc09b42405656d /backends/Makefile.am | |
| parent | 9f6ffdc1b75fd69ecda219c9e9f1b2551f542b26 (diff) | |
| parent | 6358858c4d65e8fb12a112198ee1d4bcab0be876 (diff) | |
Merge tag 'elfutils-0.169'QtCreator4.5.1QtCreator4.5.0-rc1QtCreator4.5.0QtCreator4.4.1QtCreator4.4.0-rc1QtCreator4.4.0-beta1QtCreator4.4.04.54.4
Conflicts:
ChangeLog
backends/ChangeLog
config/ChangeLog
lib/ChangeLog
libasm/ChangeLog
libcpu/ChangeLog
libdw/ChangeLog
libdwfl/ChangeLog
libdwfl/derelocate.c
libdwfl/linux-kernel-modules.c
libebl/ChangeLog
libelf/ChangeLog
src/ChangeLog
tests/ChangeLog
Change-Id: I3b7ced947c6498290aaae27443985b84531f0bcd
Diffstat (limited to 'backends/Makefile.am')
| -rw-r--r-- | backends/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/Makefile.am b/backends/Makefile.am index 526fcb99..c08e675b 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -54,7 +54,7 @@ endif i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \ i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \ - i386_initreg.c + i386_initreg.c i386_unwind.c cpu_i386 = ../libcpu/libcpu_i386.a libebl_i386_pic_a_SOURCES = $(i386_SRCS) am_libebl_i386_pic_a_OBJECTS = $(i386_SRCS:.c=.os) @@ -65,7 +65,7 @@ am_libebl_sh_pic_a_OBJECTS = $(sh_SRCS:.c=.os) x86_64_SRCS = x86_64_init.c x86_64_symbol.c x86_64_corenote.c x86_64_cfi.c \ x86_64_retval.c x86_64_regs.c i386_auxv.c x86_64_syscall.c \ - x86_64_initreg.c x32_corenote.c + x86_64_initreg.c x86_64_unwind.c x32_corenote.c cpu_x86_64 = ../libcpu/libcpu_x86_64.a libebl_x86_64_pic_a_SOURCES = $(x86_64_SRCS) am_libebl_x86_64_pic_a_OBJECTS = $(x86_64_SRCS:.c=.os) @@ -87,7 +87,7 @@ am_libebl_arm_pic_a_OBJECTS = $(arm_SRCS:.c=.os) aarch64_SRCS = aarch64_init.c aarch64_regs.c aarch64_symbol.c \ aarch64_corenote.c aarch64_retval.c aarch64_cfi.c \ - aarch64_initreg.c + aarch64_initreg.c aarch64_unwind.c libebl_aarch64_pic_a_SOURCES = $(aarch64_SRCS) am_libebl_aarch64_pic_a_OBJECTS = $(aarch64_SRCS:.c=.os) |