Commit 1647e056 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

make: Itroduce PROTOUFIX variable

We will need it for x86-32 as well, not on ARM only.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 9fd61881
...@@ -51,6 +51,8 @@ ifeq ($(ARCH),i386) ...@@ -51,6 +51,8 @@ ifeq ($(ARCH),i386)
SRCARCH := x86-32 SRCARCH := x86-32
DEFINES := -DCONFIG_X86_32 DEFINES := -DCONFIG_X86_32
VDSO := y VDSO := y
PROTOUFIX := y
export PROTOUFIX
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
SRCARCH := x86 SRCARCH := x86
...@@ -78,6 +80,11 @@ ifeq ($(ARCH),aarch64) ...@@ -78,6 +80,11 @@ ifeq ($(ARCH),aarch64)
VDSO := y VDSO := y
endif endif
ifeq ($(SRCARCH),arm)
PROTOUFIX := y
export PROTOUFIX
endif
SRCARCH ?= $(ARCH) SRCARCH ?= $(ARCH)
LDARCH ?= $(SRCARCH) LDARCH ?= $(SRCARCH)
......
...@@ -74,7 +74,7 @@ define gen-proto-rules ...@@ -74,7 +74,7 @@ define gen-proto-rules
$(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2)))
$$(E) " PBCC " $$@ $$(E) " PBCC " $$@
$$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$< $$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$<
ifeq ($(SRCARCH),arm) ifeq ($(PROTOUFIX),y)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@ $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@) $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@)
$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.h,%.c,$$@) $$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.h,%.c,$$@)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment