[v2,08/17] s390: Enable s390 build in Makefile

Submitted by Michael Holzheu on June 29, 2017, 7:24 p.m.

Details

Message ID 20170629192445.55580-9-holzheu@linux.vnet.ibm.com
State New
Series "✗ travis-ci: failure for Add architecture support for s390x (rev2)"
Headers show

Commit Message

Michael Holzheu June 29, 2017, 7:24 p.m.
Reviewed-by: Alice Frosi <alice@linux.vnet.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/Makefile b/Makefile
index cfc5870..848cf0f 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@  UNAME-M := $(shell uname -m)
 
 #
 # Supported Architectures
-ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),)
+ifneq ($(filter-out x86 arm aarch64 ppc64 s390,$(ARCH)),)
         $(error "The architecture $(ARCH) isn't supported")
 endif
 
@@ -65,6 +65,13 @@  ifeq ($(ARCH),x86)
         DEFINES		:= -DCONFIG_X86_64
 endif
 
+ifeq ($(ARCH),s390)
+        ARCH		:= s390
+        SRCARCH		:= s390
+        VDSO		:= y
+        DEFINES		:= -DCONFIG_S390
+endif
+
 LDARCH ?= $(SRCARCH)
 export LDARCH VDSO
 export PROTOUFIX DEFINES

Comments

Dmitry Safonov June 30, 2017, 1:49 p.m.
2017-06-29 22:24 GMT+03:00 Michael Holzheu <holzheu@linux.vnet.ibm.com>:
> Reviewed-by: Alice Frosi <alice@linux.vnet.ibm.com>
> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>

Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>

> ---
>  Makefile | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index cfc5870..848cf0f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -21,7 +21,7 @@ UNAME-M := $(shell uname -m)
>
>  #
>  # Supported Architectures
> -ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),)
> +ifneq ($(filter-out x86 arm aarch64 ppc64 s390,$(ARCH)),)
>          $(error "The architecture $(ARCH) isn't supported")
>  endif
>
> @@ -65,6 +65,13 @@ ifeq ($(ARCH),x86)
>          DEFINES                := -DCONFIG_X86_64
>  endif
>
> +ifeq ($(ARCH),s390)
> +        ARCH           := s390
> +        SRCARCH                := s390
> +        VDSO           := y
> +        DEFINES                := -DCONFIG_S390
> +endif
> +
>  LDARCH ?= $(SRCARCH)
>  export LDARCH VDSO
>  export PROTOUFIX DEFINES
> --
> 2.7.4
>
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu