From 0e55d587c67ef8f71a5c19be39fc9263ba1de54b Mon Sep 17 00:00:00 2001 From: Duane Rettig <duane@franz.com> Date: Mon, 23 May 2016 13:18:51 -0700 Subject: [PATCH] Add arm64 files Add Makefile.arm64 Add arm64 changes to Makefile, Makefile.wnn Change-Id: I583a8b8ff64460126a30f58899c2b8171155eedd --- Makefile | 4 ++++ Makefile.arm64 | 37 +++++++++++++++++++++++++++++++++++++ Makefile.wnn | 6 +++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 Makefile.arm64 diff --git a/Makefile b/Makefile index 07c5a647..c9bc02a4 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,9 @@ ifeq ($(OS_NAME),linux) ifeq ($(MACHINE),ppc) HOST = linuxppc else +ifeq ($(MACHINE),arm64) +HOST = arm64 +else ifeq ($(SIXTYFOURBIT),yes) HOST = amd64 else @@ -28,6 +31,7 @@ HOST = linux endif endif endif +endif ifeq ($(OS_NAME),freebsd) HOST = freebsd diff --git a/Makefile.arm64 b/Makefile.arm64 new file mode 100644 index 00000000..4074bcb4 --- /dev/null +++ b/Makefile.arm64 @@ -0,0 +1,37 @@ + +include Makefile.defs + +Makefile=Makefile.arm64 + +ifeq ($(shell if test -d /usr/include/openmotif; then echo yes; fi),yes) +XINCLUDES = -I/usr/include/openmotif +XLIBDIR = /usr/lib64/openmotif +endif + +XINCLUDES ?= /usr/include +XLIBDIR ?= /usr/lib64 + +TKLIB=-lXm -lXpm -lXext -lXp +XTLIB=-lXt +XLIB=-lX11 + +ifdef FI_USE_DMALLOC +THREADLIB = -lpthread -ldmallocth +CFLAGS = -I/usr/local/include +else +THREADLIB = -lpthread +endif + +SET_LIBRARY_PATH = LD_RUN_PATH=$(XLIBDIR):/lib:/usr/lib; export LD_RUN_PATH + +PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) + +#MOTIFXTRAS=-lgen + +PICFLAGS = -fPIC +SHAREFLAGS = +MAKE_SHARED = ld -shared -L$(XLIBDIR) +STD_DEFINES = -DSVR4 -DSYSV +AR = ar cq + +include Makefile.generic diff --git a/Makefile.wnn b/Makefile.wnn index 806929a5..575d382e 100644 --- a/Makefile.wnn +++ b/Makefile.wnn @@ -108,11 +108,15 @@ ifeq ($(OS_NAME),freebsd) REDHATLIBS = -lcrypt endif -ifeq ($(MACHINE),x86_64) ifeq ($(OS_NAME),linux) +ifeq ($(MACHINE),x86_64) REDHATLIBS = -lcrypt endif +ifeq ($(MACHINE),arm64) +REDHATLIBS = -lcrypt endif +endif + wnn.$(SHARED_EXT): $(WNN_OBJS) $(MAKE_SHARED) $(SHAREFLAGS) -o wnn.$(SHARED_EXT) $(WNN_OBJS) \ -- GitLab