diff options
author | Kir Kolyshkin <kir@openvz.org> | 2016-12-08 12:44:29 +0300 |
---|---|---|
committer | Andrei Vagin <avagin@virtuozzo.com> | 2017-03-15 00:06:17 +0300 |
commit | 9d6228630bf20434ed01fc490b839efbe1e80fd1 (patch) | |
tree | 20c68ad39697b1f0a6fc9470bbd3888da5f0745d /compel/Makefile | |
parent | 7cd6ad5e7ea50933eab6c48e9a071eb834353098 (diff) |
compel hgen: use for ARM, kill gen-offsets.sh
I am not quite sure how that happened, but compel hgen was not used for
ARM/ARM64, instead there's a simple version of it, called
gen-offsets.sh. The main difference is, shell script doesn't handle ELF
relocations, which apparently is not (currently?) needed for ARM.
It's bad to maintain two tools for the same functionality, so this
patch kills gen-offsets.sh and related stuff, making compel hgen
working on ARM. ELF relocations are still not handled, this code
is #ifdef-ed out for now and can be fixed to work on ARM later.
This patch also kills some macros and defines that seem obsoleted
now. For example, compel_relocs_apply() is now called unconditionally,
as it handles the trivial case of 0 relocs just fine.
Now, I checked that the blob headers generated by compel hgen and
gen-offsets.h are similar (i.e. generated blob code and values defined
are the same), but haven't done much above that.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'compel/Makefile')
-rw-r--r-- | compel/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compel/Makefile b/compel/Makefile index 8c580fdf3..65426d812 100644 --- a/compel/Makefile +++ b/compel/Makefile @@ -26,6 +26,12 @@ lib-y += src/lib/infect-util.o lib-y += src/lib/infect.o lib-y += src/lib/ptrace.o +# handle_elf() has no support of ELF relocations on ARM (yet?) +ifneq ($(filter arm aarch64,$(ARCH)),) +CFLAGS += -DNO_RELOCS +HOSTCFLAGS += -DNO_RELOCS +endif + ifeq ($(ARCH),x86) obj-y += src/lib/handle-elf-32.o endif |