jacinto6: Update SGX KM source to DDK 1.17

Signed-off-by: Andrew F. Davis <afd@ti.com>

115 files changed, 10754 insertions, 2334 deletions

diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
index bfb50e3..9c6aa1b 100644
--- a/jacinto6/sgx/Android.mk
+++ b/jacinto6/sgx/Android.mk
@@ -28,7 +28,7 @@ LOCAL_PATH := $$(img-sgx.untarred_bin)
 include $$(BUILD_SYSTEM)/base_rules.mk
 $$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
 $$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-        $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1))
+        $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$1)
         @echo "Copy $$@ <- $(FIXED_SRC)"
         @mkdir -p $(dir $$@)
         $$(hide) $$(ACP) -fp $(FIXED_SRC) $$@
diff --git a/jacinto6/sgx_src/Android.mk b/jacinto6/sgx_src/Android.mk
index 663404c..b5c011d 100644
--- a/jacinto6/sgx_src/Android.mk
+++ b/jacinto6/sgx_src/Android.mk
@@ -36,7 +36,7 @@ $(PVRSRVKM): $(local-build)/Makefile $(KERNELDIR)/.version
                 ANDROID_ROOT=$(ANDROID_BUILD_TOP) \
                 PLATFORM_RELEASE="8.0" \
                 OUT=$(ANDROID_BUILD_TOP)/$(out-intermediates)
-        @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target/$(MODULE_TARGET) $@
+        @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target_armv7-a/$(MODULE_TARGET) $@
         @echo "Finished building $@"
 
 GEN := $(out-intermediates)/$(MODULE_TARGET)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/_objects.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/_objects.mk
new file mode 100644
index 0000000..82da9d6
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/_objects.mk
@@ -0,0 +1,121 @@
+########################################################################### ###
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#@Description   Common processing for all modules that compile code.
+### ###########################################################################
+
+# Filter for source types
+MODULE_C_SOURCES := $(filter %.c,$(MODULE_SOURCES))
+MODULE_CXX_SOURCES := $(filter %.cpp,$(MODULE_SOURCES))
+
+MODULE_UNRECOGNISED_SOURCES := $(filter-out %.c %.cpp, $(MODULE_SOURCES))
+
+ifneq ($(strip $(MODULE_UNRECOGNISED_SOURCES)),)
+$(error In makefile $(THIS_MAKEFILE): Module $(THIS_MODULE) specified source files with unrecognised suffixes: $(MODULE_UNRECOGNISED_SOURCES))
+endif
+
+# Objects built from MODULE_SOURCES
+# Objects built from MODULE_C_SOURCES and MODULE_CXX_SOURCES
+MODULE_C_OBJECTS := $(addprefix $(MODULE_INTERMEDIATES_DIR)/,$(foreach _cobj,$(MODULE_C_SOURCES:.c=.o),$(notdir $(_cobj))))
+MODULE_CXX_OBJECTS := $(addprefix $(MODULE_INTERMEDIATES_DIR)/,$(foreach _cxxobj,$(MODULE_CXX_SOURCES:.cpp=.o),$(notdir $(_cxxobj))))
+
+# MODULE_GENERATED_DEPENDENCIES are generated as a side effect of running the
+# rules below, but if we wanted to generate .d files for things that GCC
+# couldn't handle, we could add a rule with $(MODULE_GENERATED_DEPENDENCIES)
+# as a target
+MODULE_GENERATED_DEPENDENCIES := $(MODULE_C_OBJECTS:.o=.d) $(MODULE_CXX_OBJECTS:.o=.d)
+-include $(MODULE_GENERATED_DEPENDENCIES)
+
+MODULE_DEPENDS := $(addprefix $(MODULE_OUT)/,$($(THIS_MODULE)_depends))
+MODULE_DEPENDS += $(addprefix $(GENERATED_CODE_OUT)/,$($(THIS_MODULE)_genheaders))
+
+# Add any MODULE_OUT relative include flags here
+MODULE_INCLUDE_FLAGS += $(addprefix -I $(MODULE_OUT)/, $($(THIS_MODULE)_includes_relative))
+
+define rule-for-objects-o-from-one-c
+$(1): MODULE_CC := $$(MODULE_CC)
+$(1): MODULE_CFLAGS := $$(MODULE_CFLAGS)
+$(1): MODULE_HOST_CFLAGS := $$(MODULE_HOST_CFLAGS)
+$(1): MODULE_INCLUDE_FLAGS := $$(MODULE_INCLUDE_FLAGS)
+$(1): MODULE_ALLOWED_CFLAGS := $$(MODULE_ALLOWED_CFLAGS)
+$(1): THIS_MODULE := $$(THIS_MODULE)
+ifneq ($(PKG_CONFIG_ENV_VAR),)
+$(1): export PKG_CONFIG_TOP_BUILD_DIR := $(abspath $(MODULE_OUT))
+$(1): export $(PKG_CONFIG_ENV_VAR) := $(abspath $(MODULE_OUT)/pkgconfig)
+endif
+$(1): export PKG_CONFIG_SYSROOT_DIR := $(PKG_CONFIG_SYSROOT_DIR)
+$(1): $$(MODULE_DEPENDS) $$(THIS_MAKEFILE)
+$(1): | $$(MODULE_INTERMEDIATES_DIR)
+$(1): $(2)
+        @: $(if $(MODULE_CHECK_CFLAGS),
+                $(if $(filter-out $(MODULE_ALLOWED_CFLAGS),$($(THIS_MODULE)_cflags)),\
+                        $(error $(THIS_MODULE): LTO-incompatible cflag(s) used: \
+                                $(filter-out $(MODULE_ALLOWED_CFLAGS),$($(THIS_MODULE)_cflags)))))
+        $$(check-src)
+ifeq ($(MODULE_HOST_BUILD),true)
+        $$(host-o-from-one-c)
+else
+        $$(target-o-from-one-c)
+endif
+endef
+
+# This rule is used to compile C++ source files
+define rule-for-objects-o-from-one-cxx
+$(1): MODULE_CXX := $$(MODULE_CXX)
+$(1): MODULE_CXXFLAGS := $$(MODULE_CXXFLAGS)
+$(1): MODULE_HOST_CXXFLAGS := $$(MODULE_HOST_CXXFLAGS)
+$(1): MODULE_INCLUDE_FLAGS := $$(MODULE_INCLUDE_FLAGS)
+$(1): MODULE_ALLOWED_CFLAGS := $$(MODULE_ALLOWED_CFLAGS)
+$(1): THIS_MODULE := $$(THIS_MODULE)
+ifneq ($(PKG_CONFIG_ENV_VAR),)
+$(1): export PKG_CONFIG_TOP_BUILD_DIR := $(abspath $(MODULE_OUT))
+$(1): export $(PKG_CONFIG_ENV_VAR) := $(abspath $(MODULE_OUT)/pkgconfig)
+endif
+$(1): $$(MODULE_DEPENDS) $$(THIS_MAKEFILE)
+$(1): | $$(MODULE_INTERMEDIATES_DIR)
+$(1): $(2)
+        @: $(if $(MODULE_CHECK_CFLAGS),
+                $(if $(filter-out $(MODULE_ALLOWED_CFLAGS),$($(THIS_MODULE)_cxxflags)),\
+                        $(error $(THIS_MODULE): LTO-incompatible cxxflag(s) used: \
+                                $(filter-out $(MODULE_ALLOWED_CFLAGS),$($(THIS_MODULE)_cxxflags)))))
+ifeq ($(MODULE_HOST_BUILD),true)
+        $$(host-o-from-one-cxx)
+else
+        $$(target-o-from-one-cxx)
+endif
+endef
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/bits.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/bits.mk
index d04aa7b..b6bcbbc 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/bits.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/bits.mk
@@ -50,8 +50,9 @@ $(foreach _module_to_find,$(patsubst whereis-%,%,$(filter whereis-%,$(MAKECMDGOA
 endif
 
 ifneq ($(filter whatis-%,$(MAKECMDGOALS)),)
-whatis-$(RELATIVE_OUT)/target/%: ;
-whatis-$(RELATIVE_OUT)/host/%: ;
+whatis-$(HOST_OUT)/%: ;
+whatis-$(TARGET_PRIMARY_OUT)/%: ;
+whatis-$(TARGET_NEUTRAL_OUT)/%: ;
 $(foreach _file_to_find,$(patsubst whatis-%,%,$(filter whatis-%,$(MAKECMDGOALS))),$(info $(strip $(foreach _m,$(ALL_MODULES),$(if $(filter $(_file_to_find),$(INTERNAL_TARGETS_FOR_$(_m))),$(_file_to_find) is in $(_m) which is defined in $(INTERNAL_MAKEFILE_FOR_MODULE_$(_m)),)))))
 endif
 
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
index f20ee5b..4d4afa6 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
@@ -46,6 +46,9 @@
 # COMMON_CFLAGS or COMMON_USER_FLAGS. These flags are shared between
 # host and target, which might use compilers with different capabilities.
 
+# ANOTHER NOTE: All flags here must be architecture-independent (i.e. no
+# -march or toolchain include paths)
+
 # These flags are used for kernel, User C and User C++
 #
 COMMON_FLAGS := -W -Wall
@@ -54,7 +57,7 @@ COMMON_FLAGS := -W -Wall
 #
 COMMON_CFLAGS := $(COMMON_FLAGS) \
  -Wdeclaration-after-statement -Wno-format-zero-length \
- -Wstrict-prototypes
+ -Wmissing-prototypes -Wstrict-prototypes
 
 # User C and User C++ optimization control. Does not affect kernel.
 #
@@ -76,7 +79,7 @@ COMMON_USER_FLAGS += -fno-strict-aliasing
 # We always enable debugging. Either the release binaries are stripped
 # and the symbols put in the symbolpackage, or we're building debug.
 #
-COMMON_USER_FLAGS += -g $(ANDROID_FPGA_FORCE_32BIT)
+COMMON_USER_FLAGS += -g
 
 # User C and User C++ warning flags
 #
@@ -164,6 +167,7 @@ KBUILD_FLAGS := \
 # androideabi toolchain adds `pic` by default, disable it
 # for kernel module build
 KBUILD_FLAGS += -fno-pic
+KBUILD_FLAGS += -fstack-protector-strong
 
 TESTED_KBUILD_FLAGS := \
  $(call kernel-cc-option,-Wmissing-include-dirs) \
@@ -171,6 +175,7 @@ TESTED_KBUILD_FLAGS := \
  $(call kernel-cc-option,-Wno-pointer-arith) \
  $(call kernel-cc-option,-Wno-aggregate-return) \
  $(call kernel-cc-option,-Wno-unused-but-set-variable) \
+ $(call kernel-cc-option,-Wno-ignored-qualifiers) \
  $(call kernel-cc-option,-Wno-old-style-declaration) \
  $(call kernel-cc-optional-warning,-Wbad-function-cast) \
  $(call kernel-cc-optional-warning,-Wcast-qual) \
@@ -233,25 +238,18 @@ ALL_KBUILD_CFLAGS := $(COMMON_CFLAGS) $(KBUILD_FLAGS) $(TESTED_KBUILD_FLAGS)
 # For the same reason (Darwin 'ld') don't bother checking for text
 # relocations in host binaries.
 #
-ALL_HOST_LDFLAGS := -L$(HOST_OUT)
-ALL_LDFLAGS := \
- -Wl,--warn-shared-textrel \
- -L$(TARGET_OUT) -Xlinker -rpath-link=$(TARGET_OUT)
-
-ifneq ($(strip $(TOOLCHAIN)),)
-ALL_LDFLAGS += -L$(TOOLCHAIN)/lib -Xlinker -rpath-link=$(TOOLCHAIN)/lib
-endif
+ALL_HOST_LDFLAGS :=
+ALL_LDFLAGS := -Wl,--warn-shared-textrel
 
-ifneq ($(strip $(TOOLCHAIN2)),)
-ALL_LDFLAGS += -L$(TOOLCHAIN2)/lib -Xlinker -rpath-link=$(TOOLCHAIN2)/lib
-endif
+ALL_LDFLAGS += $(SYS_LDFLAGS)
 
-ifneq ($(strip $(LINKER_RPATH)),)
-ALL_LDFLAGS += $(addprefix -Xlinker -rpath=,$(LINKER_RPATH))
+# Optional security hardening features.
+ifneq ($(FORTIFY),)
+ALL_CFLAGS   += -fstack-protector -Wa,--noexecstack -D_FORTIFY_SOURCE=2
+ALL_CXXFLAGS += -fstack-protector -Wa,--noexecstack -D_FORTIFY_SOURCE=2
+ALL_LDFLAGS  += -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
 endif
 
-ALL_LDFLAGS += $(SYS_LDFLAGS)
-
 # This variable contains a list of all modules built by kbuild
 ALL_KBUILD_MODULES :=
 
@@ -259,4 +257,11 @@ ALL_KBUILD_MODULES :=
 ALL_CXX_MODULES :=
 
 # Toolchain triple for cross environment
-CROSS_TRIPLE := $(patsubst %-,%,$(CROSS_COMPILE))
+CROSS_TRIPLE := $(patsubst %-,%,$(notdir $(CROSS_COMPILE)))
+
+ifneq ($(TOOLCHAIN),)
+$(warning **********************************************)
+$(warning  The TOOLCHAIN option has been removed, but)
+$(warning  you have it set (via $(origin TOOLCHAIN)))
+$(warning **********************************************)
+endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
index ab7a0e9..d4876c9 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
@@ -49,79 +49,79 @@
 
 define host-o-from-one-c
 $(if $(V),,@echo "  HOST_CC " $(call relative-to-top,$<))
-$(HOST_CC) -MD -c $(MODULE_HOST_CFLAGS) $(MODULE_INCLUDE_FLAGS) \
+$(MODULE_CC) -MD -c $(MODULE_HOST_CFLAGS) $(MODULE_INCLUDE_FLAGS) \
         -include $(CONFIG_H) $< -o $@
 endef
 
 define target-o-from-one-c
 $(if $(V),,@echo "  CC      " $(call relative-to-top,$<))
-$(CC) -MD -c $(MODULE_CFLAGS) $(SYS_INCLUDES) $(MODULE_INCLUDE_FLAGS) \
+$(MODULE_CC) -MD -c $(MODULE_CFLAGS) $(SYS_INCLUDES) $(MODULE_INCLUDE_FLAGS) \
          -include $(CONFIG_H) $< -o $@
 endef
 
 define host-o-from-one-cxx
 $(if $(V),,@echo "  HOST_CXX" $(call relative-to-top,$<))
-$(HOST_CXX) -MD -c $(MODULE_HOST_CXXFLAGS) $(MODULE_INCLUDE_FLAGS) \
+$(MODULE_CXX) -MD -c $(MODULE_HOST_CXXFLAGS) $(MODULE_INCLUDE_FLAGS) \
         -include $(CONFIG_H) $< -o $@
 endef
 
 define target-o-from-one-cxx
 $(if $(V),,@echo "  CXX     " $(call relative-to-top,$<))
-$(CXX) -MD -c $(MODULE_CXXFLAGS) $(SYS_INCLUDES) $(MODULE_INCLUDE_FLAGS) \
+$(MODULE_CXX) -MD -c $(MODULE_CXXFLAGS) $(SYS_INCLUDES) $(MODULE_INCLUDE_FLAGS) \
         -include $(CONFIG_H) $< -o $@
 endef
 
 define host-executable-from-o
 $(if $(V),,@echo "  HOST_LD " $(call relative-to-top,$@))
-$(HOST_CC) $(MODULE_HOST_LDFLAGS) \
+$(MODULE_CC) $(MODULE_HOST_LDFLAGS) \
         -o $@ $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_LIBRARY_DIR_FLAGS) \
         $(MODULE_LIBRARY_FLAGS)
 endef
 
 define host-executable-cxx-from-o
 $(if $(V),,@echo "  HOST_LD " $(call relative-to-top,$@))
-$(HOST_CXX) $(MODULE_HOST_LDFLAGS) \
+$(MODULE_CXX) $(MODULE_HOST_LDFLAGS) \
         -o $@ $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_LIBRARY_DIR_FLAGS) \
         $(MODULE_LIBRARY_FLAGS)
 endef
 
 define target-executable-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
-$(CC) \
-        $(SYS_EXE_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
-        $(SYS_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_EXE_CRTEND) \
-        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
+$(MODULE_CC) \
+        $(MODULE_EXE_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(MODULE_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_EXE_CRTEND) \
+        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(MODULE_LIBGCC)
 endef
 
 define target-executable-cxx-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
-$(CXX) \
-        $(SYS_EXE_LDFLAGS_CXX) $(SYS_EXE_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
-        $(SYS_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_EXE_CRTEND) \
-        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
+$(MODULE_CXX) \
+        $(MODULE_EXE_LDFLAGS_CXX) $(MODULE_LDFLAGS) -o $@ \
+        $(MODULE_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_EXE_CRTEND) \
+        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(MODULE_LIBGCC)
 endef
 
 define target-shared-library-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
-$(CC) -shared -Wl,-Bsymbolic \
-        $(SYS_LIB_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
-        $(SYS_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_LIB_CRTEND) \
-        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
+$(MODULE_CC) -shared -Wl,-Bsymbolic \
+        $(MODULE_LIB_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(MODULE_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_LIB_CRTEND) \
+        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(MODULE_LIBGCC)
 endef
 
 # If there were any C++ source files in a shared library, we use this recipe,
 # which runs the C++ compiler to link the final library
 define target-shared-library-cxx-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
-$(CXX) -shared -Wl,-Bsymbolic \
-        $(SYS_LIB_LDFLAGS_CXX) $(SYS_LIB_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
-        $(SYS_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_LIB_CRTEND) \
-        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
+$(MODULE_CXX) -shared -Wl,-Bsymbolic \
+        $(MODULE_LIB_LDFLAGS_CXX) $(MODULE_LDFLAGS) -o $@ \
+        $(MODULE_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(MODULE_LIB_CRTEND) \
+        $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(MODULE_LIBGCC)
 endef
 
 define host-shared-library-from-o
 $(if $(V),,@echo "  HOST_LD " $(call relative-to-top,$@))
-$(HOST_CC) -shared -Wl,-Bsymbolic \
+$(MODULE_CC) -shared -Wl,-Bsymbolic \
         $(MODULE_HOST_LDFLAGS) -o $@ \
         $(sort $(MODULE_ALL_OBJECTS)) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS)
@@ -131,7 +131,7 @@ endef
 # which runs the C++ compiler to link the final library
 define host-shared-library-cxx-from-o
 $(if $(V),,@echo "  HOST_LD " $(call relative-to-top,$@))
-$(HOST_CXX) -shared -Wl,-Bsymbolic \
+$(MODULE_CXX) -shared -Wl,-Bsymbolic \
         $(MODULE_HOST_LDFLAGS) -o $@ \
         $(sort $(MODULE_ALL_OBJECTS)) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS)
@@ -194,7 +194,10 @@ endef
 
 BISON ?= bison
 CC ?= gcc
+CC_SECONDARY ?= $(CC)
+CROSS_COMPILE_SECONDARY ?= $(CROSS_COMPILE)
 CXX ?= g++
+CXX_SECONDARY ?= $(CXX)
 HOST_CC ?= gcc
 HOST_CXX ?= g++
 JAR ?= jar
@@ -216,26 +219,68 @@ override CC_CHECK	:= $(if $(V),,@)$(MAKE_TOP)/tools/cc-check.sh
 # is reflected in the use of -target. For GCC this is always encoded into
 # the binary. If CROSS_COMPILE is not set we can skip this.
 #
-ifneq ($(CROSS_COMPILE),)
-ifeq ($(cc-is-clang),true)
-override CC  := $(if $(V),,@)$(CCACHE) $(CC) \
- -target $(patsubst %-,%,$(CROSS_COMPILE)) \
- -B$(dir $(shell which $(CROSS_COMPILE)gcc))
-override CXX := $(if $(V),,@)$(CCACHE) $(CXX) \
- -target $(patsubst %-,%,$(CROSS_COMPILE)) \
- -B$(dir $(shell which $(CROSS_COMPILE)gcc))
-else
-override CC  := $(if $(V),,@)$(CCACHE) $(CROSS_COMPILE)$(CC)
-override CXX := $(if $(V),,@)$(CCACHE) $(CROSS_COMPILE)$(CXX)
+# If we're doing a build with multiple target architectures, we might need
+# two separate compilers to build binaries for each architecture. In this
+# case, CROSS_COMPILE and CROSS_COMPILE_SECONDARY are the cross compiler
+# prefix for the two compilers - $(CC) and $(CC_SECONDARY).
+#
+# Set the secondary compiler first before we overwrite $(CC).
+#
+
+ifneq ($(CROSS_COMPILE_SECONDARY),)
+ ifeq ($(cc-is-clang),true)
+  override CC_SECONDARY   := \
+   $(CC_SECONDARY) \
+   -target $(patsubst %-,%,$(CROSS_COMPILE_SECONDARY)) \
+   -B$(dir $(shell which $(CROSS_COMPILE_SECONDARY)gcc))
+  override CXX_SECONDARY  := \
+   $(CXX_SECONDARY) \
+   -target $(patsubst %-,%,$(CROSS_COMPILE_SECONDARY)) \
+   -B$(dir $(shell which $(CROSS_COMPILE_SECONDARY)gcc))
+ else
+  ifeq ($(origin CC_SECONDARY),file)
+   override CC_SECONDARY  := $(CROSS_COMPILE_SECONDARY)$(CC_SECONDARY)
+  endif
+  ifeq ($(origin CXX_SECONDARY),file)
+   override CXX_SECONDARY := $(CROSS_COMPILE_SECONDARY)$(CXX_SECONDARY)
+  endif
+ endif
 endif
+
+# Apply compiler wrappers and V=1 handling
+override CC_SECONDARY     := $(if $(V),,@)$(CCACHE)$(DISTCC) $(CC_SECONDARY)
+override CXX_SECONDARY    := $(if $(V),,@)$(CCACHE)$(DISTCC) $(CXX_SECONDARY)
+
+ifneq ($(CROSS_COMPILE),)
+ ifeq ($(cc-is-clang),true)
+  override CC   := \
+   $(CC) \
+   -target $(patsubst %-,%,$(CROSS_COMPILE)) \
+   -B$(dir $(shell which $(CROSS_COMPILE)gcc))
+  override CXX  := \
+   $(CXX) \
+   -target $(patsubst %-,%,$(CROSS_COMPILE)) \
+   -B$(dir $(shell which $(CROSS_COMPILE)gcc))
+ else
+  ifeq ($(origin CC),file)
+   override CC  := $(CROSS_COMPILE)$(CC)
+  endif
+  ifeq ($(origin CXX),file)
+   override CXX := $(CROSS_COMPILE)$(CXX)
+  endif
+ endif
 else
-override CC  := $(if $(V),,@)$(CCACHE) $(CC)
-override CXX := $(if $(V),,@)$(CCACHE) $(CXX)
+ $(if $(CROSS_COMPILE_SECONDARY),$(error CROSS_COMPILE_SECONDARY is set but CROSS_COMPILE is empty))
 endif
 
+# Apply compiler wrappers and V=1 handling
+override CC     := $(if $(V),,@)$(CCACHE)$(DISTCC) $(CC)
+override CXX    := $(if $(V),,@)$(CCACHE)$(DISTCC) $(CXX)
+
 override AR                     := $(if $(V),,@)$(CROSS_COMPILE)ar
 override BISON                  := $(if $(V),,@)$(BISON)
 override BZIP2                  := $(if $(V),,@)bzip2 -9
+override CAT                    := $(if $(V),,@)cat
 override CP                     := $(if $(V),,@)cp
 override ECHO                   := $(if $(V),,@)echo
 override FLEX                   := $(if $(V),,@)flex
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch.mk
new file mode 100644
index 0000000..7b41576
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch.mk
@@ -0,0 +1,107 @@
+########################################################################### ###
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+### ###########################################################################
+
+include ../common/android/platform_version.mk
+
+# Now we have included the platform_version.mk file, we know we have a
+# correctly configured OUT_DIR and can probe it to figure out our
+# architecture.
+
+$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
+    grep '^ro.product.cpu.abilist=\|^ro.product.cpu.abilist32=' | \
+    sed -e 's,ro.product.cpu.abilist=,JNI_CPU_ABI=,' \
+        -e 's,ro.product.cpu.abilist32=,JNI_CPU_ABI_2ND=,' | \
+    tr ',' ' ' | tr '\n' '#')))
+
+# If ARCH is set, use that to remap to an "Android" ARCH..
+ANDROID_ARCH := $(filter arm arm64 x86 x86_64,$(ARCH))
+
+# x86 is special and has another legacy ARCH name which is remapped
+ifeq ($(ARCH),i386)
+TARGET_ARCH := x86
+endif
+
+ifeq ($(ANDROID_ARCH),)
+# ..otherwise, try to use the ABI list to figure it out.
+# We check 64-bit variants before 32, as a 64-build may be backwards compatible,
+# so the abilist contain both 64- and 32-bit variants
+ifneq ($(filter arm64-v8a,$(JNI_CPU_ABI)),)
+TARGET_ARCH=arm64
+else ifneq ($(filter armeabi-v7a armeabi,$(JNI_CPU_ABI)),)
+TARGET_ARCH=arm
+else ifneq ($(filter mips64,$(JNI_CPU_ABI)),)
+TARGET_ARCH=mips64
+else ifneq ($(filter mips,$(JNI_CPU_ABI)),)
+TARGET_ARCH=mips
+else ifneq ($(filter x86_64,$(JNI_CPU_ABI)),)
+TARGET_ARCH=x86_64
+else ifneq ($(filter x86,$(JNI_CPU_ABI)),)
+TARGET_ARCH=x86
+else
+$(error ARCH not set and JNI_CPU_ABI=$(JNI_CPU_ABI) was not remappable)
+endif
+else
+TARGET_ARCH := $(ANDROID_ARCH)
+endif
+
+JNI_CPU_ABI := $(word 1,$(JNI_CPU_ABI))
+JNI_CPU_ABI_2ND := $(word 1,$(JNI_CPU_ABI_2ND))
+
+include ../common/android/arch_common.mk
+
+ifneq ($(filter arm arm64 mips mips64,$(TARGET_ARCH)),)
+LDM_PLATFORM ?= 1
+endif
+
+ifneq ($(filter x86 x86_64,$(TARGET_ARCH)),)
+LDM_PCI ?= 1
+endif
+
+ifneq ($(filter x86 x86_64,$(TARGET_ARCH)),)
+KERNEL_CROSS_COMPILE ?= undef
+endif
+
+ifneq ($(filter arm64 mips64 x86_64,$(TARGET_ARCH)),)
+ifeq ($(MULTIARCH),)
+$(warning *** 64-bit architecture detected. Enabling MULTIARCH=1.)
+$(warning *** If you want a 64-bit only build, use MULTIARCH=64only.)
+export MULTIARCH := 1
+endif
+endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
index bf3fe11..2cd272e 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
@@ -38,72 +38,121 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-ifeq ($(USE_CLANG),1)
-export CC  := $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/bin/clang
-export CXX := $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/bin/clang++
-endif
-
-# FIXME: We need to run this early because config/core.mk hasn't been
-# included yet. Use the same variable names as in that makefile.
-#
-_CC             := $(if $(filter default,$(origin CC)),gcc,$(CC))
-_CLANG  := $(shell ../tools/cc-check.sh --clang --cc $(_CC))
-
 SYS_CFLAGS := \
  -fno-short-enums \
  -funwind-tables \
  -D__linux__
-SYS_INCLUDES := \
- -isystem $(ANDROID_ROOT)/bionic/libc/arch-$(ANDROID_ARCH)/include \
- -isystem $(ANDROID_ROOT)/bionic/libc/include \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi/asm-$(ANDROID_ARCH) \
- -isystem $(ANDROID_ROOT)/bionic/libm/include \
- -isystem $(ANDROID_ROOT)/bionic/libm/include/$(ANDROID_ARCH) \
- -isystem $(ANDROID_ROOT)/bionic/libthread_db/include \
- -isystem $(ANDROID_ROOT)/external/libunwind/include \
- -isystem $(ANDROID_ROOT)/frameworks/base/include \
- -isystem $(ANDROID_ROOT)/hardware/libhardware/include \
- -isystem $(ANDROID_ROOT)/hardware/libhardware_legacy/include \
- -isystem $(ANDROID_ROOT)/system/core/include \
- -isystem $(ANDROID_ROOT)/system/core/libsync/include \
- -isystem $(ANDROID_ROOT)/system/media/camera/include \
- -isystem $(ANDROID_ROOT)/external/libdrm \
- -isystem $(ANDROID_ROOT)/external/libdrm/include/drm
-
-ifneq ($(wildcard $(ANDROID_ROOT)/external/boringssl/src/include),)
-SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/external/boringssl/src/include
-else
-SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/external/openssl/include
-endif
 
-# Obsolete libc includes
-SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/common \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/arch-$(ANDROID_ARCH)
+SYS_INCLUDES :=
+
+ifneq ($(TARGET_PLATFORM),)
+
+ # Support for building with the Android NDK >= r15b.
+ # The NDK provides only the most basic includes and libraries.
+
+ SYS_INCLUDES += \
+  -isystem $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH)/usr/include \
+  -isystem $(NDK_SYSROOT)/usr/include/drm \
+  -isystem $(NDK_SYSROOT)/usr/include
+
+else # !TARGET_PLATFORM
+
+ # These libraries are not coming from the NDK now, so we need to include them
+ # from the ANDROID_ROOT source tree.
+
+ SYS_INCLUDES += \
+  -isystem $(ANDROID_ROOT)/bionic/libc/include \
+  -isystem $(ANDROID_ROOT)/bionic/libc/kernel/android/uapi \
+  -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi \
+  -isystem $(ANDROID_ROOT)/bionic/libm/include \
+  -isystem $(ANDROID_ROOT)/external/libdrm/include/drm \
+  -isystem $(ANDROID_ROOT)/external/zlib/src \
+  -isystem $(ANDROID_ROOT)/frameworks/native/include
+
+ ifeq ($(is_future_version),1)
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/libnativehelper/include_jni
+ else ifeq ($(is_aosp_master),1)
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/libnativehelper/include_jni
+ else
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/libnativehelper/include/nativehelper
+ endif
+
+endif # !TARGET_PLATFORM
+
+ # These components aren't in the NDK. They *are* in the VNDK. If this is an
+ # NDK or non-NDK build, but not a VNDK build, include the needed bits from
+ # the ANDROID_ROOT source tree. We put libsync first because the NDK copy
+ # of the sync headers have been stripped in an unsupported way.
+
+ SYS_INCLUDES := \
+  -isystem $(ANDROID_ROOT)/system/core/libsync/include \
+  $(SYS_INCLUDES) \
+  -isystem $(ANDROID_ROOT)/external/libdrm \
+  -isystem $(ANDROID_ROOT)/external/libpng \
+  -isystem $(ANDROID_ROOT)/external/libunwind/include \
+  -isystem $(ANDROID_ROOT)/hardware/libhardware/include \
+  -isystem $(ANDROID_ROOT)/system/media/camera/include
+
+ # boringssl replaced openssl from Marshmallow
+ ifeq ($(is_at_least_marshmallow),1)
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/external/boringssl/src/include
+ else
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/external/openssl/include
+ endif
+
+ # libjpeg-turbo replaced libjpeg from Nougat
+ ifeq ($(is_at_least_nougat),1)
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/external/libjpeg-turbo
+ else
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/external/jpeg
+ endif
+
+ # Handle upstream includes refactoring
+ ifeq ($(is_at_least_oreo),1)
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/frameworks/native/libs/nativewindow/include \
+   -isystem $(ANDROID_ROOT)/system/core/libbacktrace/include \
+   -isystem $(ANDROID_ROOT)/system/core/libsystem/include \
+   -isystem $(ANDROID_ROOT)/system/core/libutils/include
+  ifeq ($(NDK_ROOT),)
+   SYS_INCLUDES += \
+    -isystem $(ANDROID_ROOT)/frameworks/native/libs/arect/include \
+    -isystem $(ANDROID_ROOT)/system/core/liblog/include
+  endif
+ else
+  SYS_INCLUDES += \
+   -isystem $(ANDROID_ROOT)/frameworks/base/include \
+   -isystem $(ANDROID_ROOT)/system/core/include
+ endif
 
 # This is comparing PVR_BUILD_DIR to see if it is omap and adding 
-# includes required for it's HWC
+# includes required for it's HWC.
 ifeq ($(notdir $(abspath .)),omap_android)
 SYS_INCLUDES += \
  -isystem $(ANDROID_ROOT)/hardware/ti/omap4xxx/kernel-headers \
  -isystem $(ANDROID_ROOT)/hardware/ti/omap4xxx/ion
 endif
 
-ifeq ($(_CLANG),true)
-SYS_INCLUDES := \
- -nostdinc $(SYS_INCLUDES) \
- -isystem $(ANDROID_ROOT)/external/clang/lib/include
-endif
+# Always include the NDK compatibility directory, because it allows us to
+# compile in inline versions of simple functions to eliminate dependencies,
+# and we can also constrain the available APIs. Do this last, so we can
+# make sure it is always first on the include list.
 
-SYS_EXE_LDFLAGS := \
- -Bdynamic -nostdlib -Wl,-dynamic-linker,/system/bin/linker \
- -lc -ldl -lcutils
+SYS_INCLUDES := -isystem eurasiacon/android/ndk $(SYS_INCLUDES)
 
-SYS_LIB_LDFLAGS := $(SYS_EXE_LDFLAGS)
+# Android enables build-id sections to allow mapping binaries to debug
+# information for symbol resolution
+SYS_LDFLAGS += -Wl,--build-id=md5
 
 SYS_EXE_LDFLAGS_CXX := -lstdc++
 
 SYS_LIB_LDFLAGS_CXX := $(SYS_EXE_LDFLAGS_CXX)
+
+OPTIM := -O2
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
index b8b97e2..5cb8d84 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
@@ -39,12 +39,6 @@
 ### ###########################################################################
 
 
-# On versions of Android prior to L, remap the use of libc++ to a combination
-# of stlport and libstdc++. Not every module written in C++ in the DDK needs
-# the STL, but linking it should be harmless (and most modules do need it).
-ifneq ($(is_at_least_lollipop),1)
-endif
-
 
 $(eval $(call BothConfigC,ANDROID,))
 
@@ -52,11 +46,15 @@ $(eval $(call BothConfigC,ANDROID,))
 
 $(eval $(call TunableBothConfigC,SUPPORT_PVRSRV_ANDROID_SYSTRACE,))
 
+$(eval $(call TunableBothConfigMake,SUPPORT_ANDROID_PLATFORM,))
 $(eval $(call TunableBothConfigMake,SUPPORT_PVRSRV_ANDROID_SYSTRACE,))
 
 $(eval $(call TunableBothConfigMake,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
 $(eval $(call TunableBothConfigC,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
 
+$(eval $(call TunableBothConfigMake,PVR_ANDROID_NATIVE_WINDOW_HAS_FENCE,))
+$(eval $(call TunableBothConfigC,PVR_ANDROID_NATIVE_WINDOW_HAS_FENCE,))
+
 ifeq ($(NO_HARDWARE),1)
  override PVR_ANDROID_COMPOSERHAL := null
 endif
@@ -68,4 +66,50 @@ ifneq ($(PVR_ANDROID_COMPOSERHAL),drm)
 endif
 
 
+# Most development systems will have at least one copy of java, but some may
+# have more. If the build system detected that a specific 'forced' version
+# of java should be used, and the user didn't override JAVAC, try to set it
+# up here. We'll use JAVA_HOME if it's set, falling back to PATH if it is
+# not.
+ifeq ($(JAVAC),)
+ # If JAVA_HOME is unset, implement some assumed paths taken from Android's
+ # build/envsetup.sh script (these are intentionally Ubuntu centric).
+ ifeq ($(JAVA_HOME),)
+  ifeq ($(LEGACY_USE_JAVA7),1)
+   JAVA_HOME ?= /usr/lib/jvm/java-7-openjdk-amd64
+  else
+   JAVA_HOME ?= /usr/lib/jvm/java-8-openjdk-amd64
+  endif
+  ifeq ($(wildcard $(JAVA_HOME)),)
+   JAVA_HOME :=
+  endif
+ endif
+
+ ifeq ($(JAVA_HOME),)
+  JAVA ?= java
+  JAVAC ?= javac
+ else
+  JAVA := $(JAVA_HOME)/bin/java
+  JAVAC := $(JAVA_HOME)/bin/javac
+  ifeq ($(wildcard $(JAVAC)),)
+   $(error JAVA_HOME does not point to a valid java installation)
+  endif
+ endif
+
+ # Test the configured JDK for validity
+ ifeq ($(LEGACY_USE_JAVA6),1)
+  ifeq ($(shell $(JAVA) -version 2>&1 | grep -qe 'Java(TM).*1\.6\.0' && echo 1 || echo 0),0)
+   $(error '$(JAVA) -version' was not for Oracle JDK 6)
+  endif
+ else ifeq ($(LEGACY_USE_JAVA7),1)
+  ifeq ($(shell $(JAVA) -version 2>&1 | grep -qe 'OpenJDK.*7u' && echo 1 || echo 0),0)
+   $(error '$(JAVA) -version' was not for OpenJDK 7)
+  endif
+ else
+  ifeq ($(shell $(JAVA) -version 2>&1 | grep -qe 'OpenJDK.*1\.8\.' && echo 1 || echo 0),0)
+   $(error '$(JAVA) -version' was not for OpenJDK 8)
+  endif
+ endif
+endif
+
 include ../common/ion.mk
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
index ba37064..bc92a6f 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
@@ -38,8 +38,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-include ../common/android/platform_version.mk
-
 # Basic support option tuning for Android
 #
 SUPPORT_ANDROID_PLATFORM := 1
@@ -72,10 +70,6 @@ OPK_DEFAULT := libpvrANDROID_WSEGL.so
 #
 KERNEL_COMPONENTS := srvkm
 
-# Kernel modules are always installed here under Android
-#
-PVRSRV_MODULE_BASEDIR := /system/modules/
-
 # Use the new PVR_DPF implementation to allow lower message levels
 # to be stripped from production drivers
 #
@@ -102,6 +96,12 @@ SUPPORT_LARGE_GENERAL_HEAP := 1
 #
 PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 5400
 
+##############################################################################
+# Enable source fortification by default
+#
+FORTIFY ?= 1
+
+##############################################################################
 # Unless overridden by the user, assume the RenderScript Compute API level
 # matches that of the SDK API_LEVEL.
 #
@@ -126,36 +126,35 @@ UNITTEST_INCLUDES := \
  $(ANDROID_ROOT)/frameworks/native/opengl/include \
  $(ANDROID_ROOT)/libnativehelper/include/nativehelper
 
-# But it doesn't have OpenVG headers
-#
 UNITTEST_INCLUDES += eurasiacon/unittests/include
 
 ##############################################################################
 # Future versions moved proprietary libraries to a vendor directory
 #
-SHLIB_DESTDIR := /system/vendor/lib
-DEMO_DESTDIR := /system/vendor/bin
-
-# EGL libraries go in a special place
-#
-EGL_DESTDIR := $(SHLIB_DESTDIR)/egl
+ifeq ($(wildcard $(TARGET_ROOT)/product/$(TARGET_DEVICE)/vendor),)
+PVRSRV_MODULE_BASEDIR := /system/lib/modules/
+BIN_DESTDIR := /system/vendor/bin
+APP_DESTDIR := /data/app
+else
+PVR_ANDROID_FORCE_APP_NATIVE_UNPACKED := 1
+PVRSRV_MODULE_BASEDIR := /vendor/lib/modules/
+BIN_DESTDIR := /vendor/bin
+APP_DESTDIR := /vendor/app
+endif
 
 ##############################################################################
-# In K and older, augment the libstdc++ includes with stlport includes. Any
-# part of the C++ library not implemented by stlport will be handled by
-# linking in libstdc++ too (see extra_config.mk).
+# Android doesn't use these install script variables. They're still in place
+# because the Linux install scripts use them.
 #
-# On L and newer, don't use stlport OR libstdc++ at all; just use libc++.
+SHLIB_DESTDIR := not-used
+EGL_DESTDIR := not-used
+
+# Must give our EGL/GLES libraries a globally unique name
 #
+EGL_BASENAME_SUFFIX := _POWERVR_SGX$(SGXCORE)_$(SGX_CORE_REV)
+
 SYS_CXXFLAGS := -fuse-cxa-atexit $(SYS_CFLAGS)
-ifeq ($(is_at_least_lollipop),1)
-SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/external/libcxx/include
-else
-SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/bionic \
- -isystem $(ANDROID_ROOT)/external/stlport/stlport
-endif
+SYS_INCLUDES += -isystem $(LIBCXX_INCLUDE_PATH)
 
 ##############################################################################
 # Support the OES_EGL_image_external extensions in the client drivers.
@@ -177,32 +176,28 @@ EGL_EXTENSION_ANDROID_RECORDABLE := 1
 EGL_EXTENSION_ANDROID_BLOB_CACHE := 1
 
 ##############################################################################
-# JB added a new corkscrew API for userland backtracing.
-#
-ifeq ($(is_at_least_lollipop),0)
-PVR_ANDROID_HAS_CORKSCREW_API := 1
-endif
-
-##############################################################################
 # JB MR1 introduces cross-process syncs associated with a fd.
 # This requires a new enough kernel version to have the base/sync driver.
 #
 EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC ?= 1
-PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC ?= 1
 
 ##############################################################################
-# Versions of Android between Cupcake and KitKat MR1 required Java 6.
+# Kernel 4.9 introduces new sync framework for cross-process sync
 #
-ifeq ($(is_at_least_lollipop),0)
-LEGACY_USE_JAVA6 ?= 1
+ifneq ($(strip $(KERNELDIR)),)
+include ../kernel_version.mk
+ifeq ($(call kernel-version-at-least,4,9,27),true)
+PVR_ANDROID_NATIVE_WINDOW_HAS_FENCE ?= 1
+else
+PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC ?= 1
+endif
 endif
 
 ##############################################################################
-# Versions of Android between ICS and KitKat MR1 used ion .heap_mask instead
-# of .heap_id_mask.
+# Versions of Android prior to Nougat required Java 7 (OpenJDK).
 #
-ifeq ($(is_at_least_lollipop),0)
-PVR_ANDROID_HAS_ION_FIELD_HEAP_MASK := 1
+ifeq ($(is_at_least_nougat),0)
+LEGACY_USE_JAVA7 ?= 1
 endif
 
 ##############################################################################
@@ -214,20 +209,12 @@ PVR_ANDROID_BCC_MULTIARCH_SUPPORT := 1
 endif
 
 ##############################################################################
-# Lollipop annotates the cursor allocation with USAGE_CURSOR to enable it to
-# be accelerated with special cursor hardware (rather than wasting an
-# overlay). This flag stops the DDK from blocking the allocation.
+# Versions of Android prior to Nougat required .apk files to be processed with
+# zipalign. Using this tool on Nougat or greater will corrupt the .apk file,
+# as alignment is already done by signapk.jar, so we must disable it.
 #
-ifeq ($(is_at_least_lollipop),1)
-PVR_ANDROID_HAS_GRALLOC_USAGE_CURSOR := 1
-endif
-
-##############################################################################
-# Lollipop changed the camera HAL metadata specification to require that
-# CONTROL_MAX_REGIONS specifies 3 integers (instead of 1).
-#
-ifeq ($(is_at_least_lollipop),1)
-PVR_ANDROID_CAMERA_CONTROL_MAX_REGIONS_HAS_THREE := 1
+ifeq ($(is_at_least_nougat),0)
+LEGACY_USE_ZIPALIGN ?= 1
 endif
 
 ##############################################################################
@@ -252,6 +239,14 @@ ifeq ($(is_at_least_marshmallow),1)
 PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1
 endif
 
+# On Android O, the <sync/sync.h> file was moved to <android/sync.h> for
+# DDK use. A symlink was left for legacy reasons, but it conflicts with
+# the NDK. Tell the driver to avoid using the symlink compatibility.
+#
+ifeq ($(is_at_least_oreo),1)
+override PVR_ANDROID_HAS_ANDROID_SYNC_H := 1
+endif
+
 # Placeholder for future version handling
 #
 ifeq ($(is_future_version),1)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/install.sh.tpl b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/install.sh.tpl
new file mode 100644
index 0000000..bc9fa24
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/install.sh.tpl
@@ -0,0 +1,315 @@
+#!/bin/bash
+############################################################################ ###
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#### ###########################################################################
+# Help on how to invoke
+#
+function usage {
+    echo "usage: $0 [options...]"
+    echo ""
+    echo "Options: -v            Verbose mode."
+    echo "         -n            Dry-run mode."
+    echo "         -u            Uninstall-only mode."
+    echo "         --root <path> Use <path> as the root of the install file system."
+    echo "                       (Overrides the DISCIMAGE environment variable.)"
+    exit 1
+}
+
+WD=`pwd`
+SCRIPT_ROOT=`dirname $0`
+cd $SCRIPT_ROOT
+
+PVRVERSION=[PVRVERSION]
+PVRBUILD=[PVRBUILD]
+PRIMARY_ARCH="[PRIMARY_ARCH]"
+ARCHITECTURES="[ARCHITECTURES]"
+
+APP_DESTDIR=[APP_DESTDIR]
+BIN_DESTDIR=[BIN_DESTDIR]
+DATA_DESTDIR=[BIN_DESTDIR]
+
+# Exit with an error messages.
+# $1=blurb
+#
+function bail {
+    if [ ! -z "$1" ]; then
+        echo "$1" >&2
+    fi
+
+    echo "" >&2
+    echo "Installation failed" >&2
+    exit 1
+}
+
+# Copy all the required files into their appropriate places on the local machine.
+function install_locally {
+    # Define functions required for local installs
+
+    # basic installation function
+    # $1=fromfile, $2=destfilename, $3=blurb, $4=chmod-flags, $5=chown-flags
+    #
+    function install_file {
+        if [ -z "$DDK_INSTALL_LOG" ]; then
+            bail "INTERNAL ERROR: Invoking install without setting logfile name"
+        fi
+        DESTFILE=${DISCIMAGE}$2
+        DESTDIR=`dirname $DESTFILE`
+
+        if [ ! -e $1 ]; then
+            [ -n "$VERBOSE" ] && echo "skipping file $1 -> $2"
+            return
+        fi
+
+        # Destination directory - make sure it's there and writable
+        #
+        if [ -d "${DESTDIR}" ]; then
+            if [ ! -w "${DESTDIR}" ]; then
+                bail "${DESTDIR} is not writable."
+            fi
+        else
+            $DOIT mkdir -p ${DESTDIR} || bail "Couldn't mkdir -p ${DESTDIR}"
+            [ -n "$VERBOSE" ] && echo "Created directory `dirname $2`"
+        fi
+
+        # Delete the original so that permissions don't persist.
+        #
+        $DOIT rm -f $DESTFILE
+
+        $DOIT cp -f $1 $DESTFILE || bail "Couldn't copy $1 to $DESTFILE"
+        $DOIT chmod $4 ${DESTFILE}
+
+        echo "$3 `basename $1` -> $2"
+        $DOIT echo "file $2" >> $DDK_INSTALL_LOG
+    }
+
+    # If we install to an empty $DISCIMAGE, then we need to create some
+    # dummy directories, even if they contain no files, otherwise 'adb
+    # sync' may fail. (It allows '/vendor' to not exist currently.)
+    [ ! -d ${DISCIMAGE}/data ]   && mkdir ${DISCIMAGE}/data
+    [ ! -d ${DISCIMAGE}/system ] && mkdir ${DISCIMAGE}/system
+
+    for arch in $ARCHITECTURES; do
+        if [ ! -d $arch ]; then
+            echo "Missing architecture $arch"
+                if [ "$arch" = "$PRIMARY_ARCH" ]; then
+                    echo "Primary architecture is missing, aborting!"
+                    exit 1
+                else
+                    continue
+                fi
+        fi
+
+        BASE_DESTDIR=`dirname ${BIN_DESTDIR}`
+        case $arch in
+            target*64*  )
+                SHLIB_DESTDIR=${BASE_DESTDIR}/lib64
+                ;;
+            *)
+                SHLIB_DESTDIR=${BASE_DESTDIR}/lib
+        esac
+        EGL_DESTDIR=${SHLIB_DESTDIR}/egl
+
+        pushd $arch > /dev/null
+        # Install UM components
+        if [ -f install_um.sh ]; then
+            DDK_INSTALL_LOG=$UMLOG
+            echo "Installing User components for architecture $arch"
+            $DOIT echo "version $PVRVERSION" > $DDK_INSTALL_LOG
+            source install_um.sh
+            echo
+        fi
+        popd > /dev/null
+    done
+
+    pushd $PRIMARY_ARCH > /dev/null
+    # Install KM components
+    if [ -f install_km.sh ]; then
+        DDK_INSTALL_LOG=$KMLOG
+        echo "Installing Kernel components for architecture $PRIMARY_ARCH"
+        $DOIT echo "version $PVRVERSION" > $DDK_INSTALL_LOG
+        source install_km.sh
+        echo
+    fi
+    popd > /dev/null
+
+    # Create an OLDLOG so old versions of the driver can uninstall.
+    $DOIT echo "version $PVRVERSION" > $OLDLOG
+    if [ -f $KMLOG ]; then
+        tail -n +2 $KMLOG >> $OLDLOG
+    fi
+    if [ -f $UMLOG ]; then
+        tail -n +2 $UMLOG >> $OLDLOG
+    fi
+
+    # Make sure new logs are newer than $OLDLOG
+    touch -m -d "last sunday" $OLDLOG
+}
+
+# Read the appropriate install log and delete anything therein.
+function uninstall_locally {
+    # Function to uninstall something.
+    function do_uninstall {
+        LOG=$1
+
+        if [ ! -f $LOG ]; then
+            echo "Nothing to un-install."
+            return;
+        fi
+
+        BAD=0
+        VERSION=""
+        while read type data; do
+            case $type in
+            version)
+                echo "Uninstalling existing version $data"
+                VERSION="$data"
+                ;;
+            link|file)
+                if [ -z "$VERSION" ]; then
+                    BAD=1;
+                    echo "No version record at head of $LOG"
+                elif ! $DOIT rm -f ${DISCIMAGE}${data}; then
+                    BAD=1;
+                else
+                    [ -n "$VERBOSE" ] && echo "Deleted $type $data"
+                fi
+                ;;
+            tree)
+                ;;
+            esac
+        done < $1;
+
+        if [ $BAD = 0 ]; then
+            echo "Uninstallation completed."
+            $DOIT rm -f $LOG
+        else
+            echo "Uninstallation failed!!!"
+        fi
+    }
+
+    if [ -z "$OLDLOG" -o -z "$KMLOG" -o -z "$UMLOG" ]; then
+        bail "INTERNAL ERROR: Invoking uninstall without setting logfile name"
+    fi
+
+    # Uninstall anything installed using the old-style install scripts.
+    LEGACY_LOG=0
+    if [ -f $OLDLOG ]; then
+        if [ -f $KMLOG -a $KMLOG -nt $OLDLOG ]; then
+            # Last install was new scheme.
+            rm $OLDLOG
+        elif [ -f $UMLOG -a $UMLOG -nt $OLDLOG ]; then
+            # Last install was new scheme.
+            rm $OLDLOG
+        else
+            echo "Uninstalling all components from legacy log."
+            do_uninstall $OLDLOG
+            LEGACY_LOG=1
+            echo
+        fi
+    fi
+
+    if [ $LEGACY_LOG = 0 ]; then
+        # Uninstall KM components if we are doing a KM install.
+        if [ -f install_km.sh -a -f $KMLOG ]; then
+            echo "Uninstalling Kernel components"
+            do_uninstall $KMLOG
+            echo
+        fi
+        # Uninstall UM components if we are doing a UM install.
+        if [ -f install_um.sh -a -f $UMLOG ]; then
+            echo "Uninstalling User components"
+            do_uninstall $UMLOG
+            echo
+        fi
+    fi
+}
+
+# Work out if there are any special instructions.
+#
+while [ "$1" ]; do
+    case "$1" in
+    -v|--verbose)
+        VERBOSE=v
+        ;;
+    -r|--root)
+        DISCIMAGE=$2
+        shift;
+        ;;
+    -u|--uninstall)
+        UNINSTALL_ONLY=y
+        ;;
+    -n)
+        DOIT=echo
+        ;;
+    -h | --help | *)
+        usage
+        ;;
+    esac
+    shift
+done
+
+if [ ! -z "$DISCIMAGE" ]; then
+
+    if [ ! -d "$DISCIMAGE" ]; then
+       bail "$0: $DISCIMAGE does not exist."
+    fi
+
+    echo
+    if [ $DISCIMAGE == "/" ]; then
+        echo "Installing PowerVR '$PVRVERSION ($PVRBUILD)' locally"
+    else
+        echo "Installing PowerVR '$PVRVERSION ($PVRBUILD)' on $DISCIMAGE"
+    fi
+    echo
+    echo "File system installation root is $DISCIMAGE"
+    echo
+
+    OLDLOG=$DISCIMAGE/powervr_ddk_install.log
+    KMLOG=$DISCIMAGE/powervr_ddk_install_km.log
+    UMLOG=$DISCIMAGE/powervr_ddk_install_um.log
+
+    uninstall_locally
+
+    if [ "$UNINSTALL_ONLY" != "y" ]; then
+        install_locally
+    fi
+
+else
+    bail "DISCIMAGE must be set for installation to be possible."
+fi
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
index 4309c72..4debd7c 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
@@ -46,12 +46,13 @@ HOST_ARCH ?= x86
 OUT_DIR ?= $(ANDROID_ROOT)/out
 
 ifeq ($(TARGET_BUILD_TYPE),debug)
-TARGET_ROOT := $(OUT_DIR)/debug/target
+TARGET_ROOT := $(ANDROID_ROOT)/out/debug/target
 else
-TARGET_ROOT := $(OUT_DIR)/target
+TARGET_ROOT := $(ANDROID_ROOT)/out/target
 endif
 
-TOOLCHAIN ?= $(TARGET_ROOT)/product/$(TARGET_DEVICE)/obj
-TOOLCHAIN2 ?= $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system
-
-LIBGCC := $(shell $(CROSS_COMPILE)gcc -m32 -print-libgcc-file-name 2>/dev/null)
+ifeq ($(NDK_ROOT),)
+LIBCXX_INCLUDE_PATH := $(ANDROID_ROOT)/external/libcxx/include
+else
+LIBCXX_INCLUDE_PATH := $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include
+endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
index b99d976..0a91f6b 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
@@ -41,25 +41,25 @@
 # If there's no build.prop file in the expected location, bail out. Tell the
 # user which file we were trying to read in case TARGET_DEVICE was not set.
 #
-#BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop
-#ifeq ($(wildcard $(BUILD_PROP)),)
-#$(warning *** Could not determine Android version.  Did you set ANDROID_ROOT,\
-#OUT_DIR and TARGET_DEVICE in your environment correctly?)
-#$(error Error reading $(BUILD_PROP))
-#endif
+BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/vendor/build.prop
+ifeq ($(wildcard $(BUILD_PROP)),)
+$(warning *** Could not determine Android version.  Did you set ANDROID_ROOT,\
+OUT_DIR and TARGET_DEVICE in your environment correctly?)
+$(error Error reading $(BUILD_PROP))
+endif
 
 # Extract version.release and version.codename from the build.prop file.
 # If either of the values aren't in the build.prop, the Make variables won't
 # be defined, and fallback handling will take place.
 #
-#define newline
-#
-#
-#endef
-#$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
-#       grep '^ro.build.version.release=\|^ro.build.version.codename=' | \
-#       sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
-#           -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#')))
+define newline
+
+
+endef
+$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
+        grep '^ro.build.version.release=\|^ro.build.id=' | \
+        sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
+            -e 's,ro.build.id=,PLATFORM_BUILDID=,' | tr '\n' '#')))
 
 define release-starts-with
 $(shell echo $(PLATFORM_RELEASE) | grep -q ^$(1); \
@@ -76,33 +76,32 @@ endef
 # ordering. You need to make sure that strings that are sub-strings of other
 # checked strings appear _later_ in this list.
 #
-# e.g. 'KitKatMR' starts with 'KitKat', but it is not KitKat.
+# e.g. 'LollipopMR1' starts with 'Lollipop', but it is not Lollipop.
 #
 # NOTE: The version codenames for Android stopped after KitKat, don't read
 # too much into the below names. They are mostly placeholders/reminders.
 #
-ifeq ($(call release-starts-with,KitKatMR),1)
-PLATFORM_RELEASE := 4.4.1
-else ifeq ($(call release-starts-with,KitKat),1)
-PLATFORM_RELEASE := 4.4
-else ifeq ($(call release-starts-with,LollipopMR1),1)
-PLATFORM_RELEASE := 5.1
-else ifeq ($(call release-starts-with,Lollipop),1)
-PLATFORM_RELEASE := 5.0
+ifeq ($(call release-starts-with,LollipopMR1),1)
+override PLATFORM_RELEASE := 5.1
 else ifeq ($(call release-starts-with,Marshmallow),1)
-PLATFORM_RELEASE := 6.0
-else ifeq ($(PLATFORM_CODENAME),AOSP)
-# AOSP (master) will normally have PLATFORM_CODENAME set to AOSP
-PLATFORM_RELEASE := 6.0.60
+override PLATFORM_RELEASE := 6.0
+else ifeq ($(call release-starts-with,NougatMR),1)
+override PLATFORM_RELEASE := 7.1
+else ifeq ($(call release-starts-with,Nougat),1)
+override PLATFORM_RELEASE := 7.0
+else ifeq ($(call release-starts-with,Oreo),1)
+override PLATFORM_RELEASE := 8.0
+else ifeq ($(PLATFORM_BUILDID),OC)
+override PLATFORM_RELEASE := 8.0.80
 else ifeq ($(shell echo $(PLATFORM_RELEASE) | grep -qE "[A-Za-z]+"; echo $$?),0)
-PLATFORM_RELEASE := 6.1
+override PLATFORM_RELEASE := 8.2
 endif
 
 # Workaround for master. Sometimes there is an AOSP version ahead of
 # the current master version number, but master still has more features.
 #
-ifeq ($(PLATFORM_RELEASE),6.0.60)
-PLATFORM_RELEASE := 6.1
+ifeq ($(PLATFORM_RELEASE),8.0.80)
+override PLATFORM_RELEASE := 8.0
 is_aosp_master := 1
 endif
 
@@ -118,37 +117,69 @@ endif
 
 # Macros to help categorize support for features and API_LEVEL for tests.
 #
-is_at_least_lollipop := \
-        $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 5 ) && echo 1 || echo 0)
 is_at_least_lollipop_mr1 := \
         $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 5 || \
                                 ( test $(PLATFORM_RELEASE_MAJ) -eq 5 && \
                                   test $(PLATFORM_RELEASE_MIN) -gt 0 ) ) && echo 1 || echo 0)
 is_at_least_marshmallow := \
         $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 6 ) && echo 1 || echo 0)
+is_at_least_nougat := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 7 ) && echo 1 || echo 0)
+is_at_least_nougat_mr1 := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 7 || \
+                                ( test $(PLATFORM_RELEASE_MAJ) -eq 7 && \
+                                  test $(PLATFORM_RELEASE_MIN) -gt 0 ) ) && echo 1 || echo 0)
+is_at_least_oreo := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 8 ) && echo 1 || echo 0)
 
-# Assume "future versions" are >6.0, but we don't really know
+# Assume "future versions" are >7.1, but we don't really know
 is_future_version := \
-        $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 6 || \
-                                ( test $(PLATFORM_RELEASE_MAJ) -eq 6 && \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 8 || \
+                                ( test $(PLATFORM_RELEASE_MAJ) -eq 8 && \
                                   test $(PLATFORM_RELEASE_MIN) -gt 0 ) ) && echo 1 || echo 0)
 
 # Picking an exact match of API_LEVEL for the platform we're building
 # against can avoid compatibility theming and affords better integration.
 #
+# This is also a good place to select the right jack toolchain.
+#
 ifeq ($(is_future_version),1)
-API_LEVEL := 23
+JACK_VERSION ?= 4.32.CANDIDATE
+API_LEVEL := 26
+else ifeq ($(is_at_least_oreo),1)
+ifeq ($(is_aosp_master),1)
+override JACK_VERSION :=
+else
+JACK_VERSION ?= 4.31.CANDIDATE
+endif
+API_LEVEL := 26
+else ifeq ($(is_at_least_nougat_mr1),1)
+JACK_VERSION ?= 3.36.CANDIDATE
+API_LEVEL := 25
+else ifeq ($(is_at_least_nougat),1)
+JACK_VERSION ?= 3.36.CANDIDATE
+API_LEVEL := 24
 else ifeq ($(is_at_least_marshmallow),1)
+JACK_VERSION ?= 2.21.RELEASE
 API_LEVEL := 23
 else ifeq ($(is_at_least_lollipop_mr1),1)
+# This early version had no version-file.version.code; fake it
+JACK_VERSION ?= 1.0.RELEASE
 API_LEVEL := 22
-else ifeq ($(is_at_least_lollipop),1)
-API_LEVEL := 21
-#API_LEVEL := 20 was l-preview
-else ifeq ($(is_at_least_kitkat),1)
-API_LEVEL := 19
 else
-$(error Must build against Android >= 4.4)
+$(error Must build against Android >= 5.1)
+endif
+
+# If the NDK is enabled, check it has API_LEVEL support for us
+ifneq ($(NDK_ROOT),)
+ NDK_PLATFORMS_ROOT ?= $(NDK_ROOT)/platforms
+ ifeq ($(strip $(wildcard $(NDK_PLATFORMS_ROOT)/android-*)),)
+  $(error NDK_PLATFORMS_ROOT does not point to a valid location)
+ endif
+ override TARGET_PLATFORM := android-$(API_LEVEL)
+ ifeq ($(strip $(wildcard $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM))),)
+  $(error NDK support for $(TARGET_PLATFORM) is missing)
+ endif
 endif
 
 # Each DDK is tested against only a single version of the platform.
@@ -156,6 +187,6 @@ endif
 #
 ifeq ($(is_future_version),1)
 $(info WARNING: Android version is newer than this DDK supports)
-else ifneq ($(is_at_least_lollipop_mr1),1)
+else ifneq ($(is_at_least_marshmallow),1)
 $(info WARNING: Android version is older than this DDK supports)
 endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
index b6f945f..dfe3018 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
@@ -61,18 +61,3 @@ $(eval $(call TunableKernelConfigC,PVR_DRI_DRM_PLATFORM_DEV,))
 
 
 
-ifeq ($(SUPPORT_DRI_DRM_PLUGIN),1)
-PVR_DRI_CLIENT_DRIVER := pvrsrvkm
-else
-# The X and Wayland window systems derive the client driver name from a
-# display driver DRM device node. The Surfaceless window system derives it
-# from a render node.
-ifeq ($(WINDOW_SYSTEM),surfaceless)
-PVR_DRI_CLIENT_DRIVER := pvr
-else
-PVR_DRI_CLIENT_DRIVER := $(if $(PVR_DRM_MODESET_DRIVER_NAME),$(PVR_DRM_MODESET_DRIVER_NAME),pvr)
-endif
-endif
-
-PVR_DRI_GET_EXTENSIONS_ENTRY_POINT := __driDriverGetExtensions_$(PVR_DRI_CLIENT_DRIVER)
-
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compiler.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
new file mode 100644
index 0000000..82c9d44
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
@@ -0,0 +1,240 @@
+########################################################################### ###
+#@File
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+### ###########################################################################
+
+# Check for valid values of $(MULTIARCH).
+ifeq ($(strip $(MULTIARCH)),0)
+$(error MULTIARCH must be empty to disable multiarch)
+endif
+
+define calculate-compiler-preferred-target
+ ifeq ($(2),qcc)
+  $(1)_compiler_preferred_target := qcc
+ else
+  $(1)_compiler_preferred_target := $$(subst --,-,$$(shell $(2) -dumpmachine))
+  ifeq ($$($(1)_compiler_preferred_target),)
+   $$(warning No output from '$(2) -dumpmachine')
+   $$(warning Check that the compiler is in your PATH and CROSS_COMPILE is)
+   $$(warning set correctly.)
+   $$(error Unable to run compiler '$(2)')
+  endif
+  ifneq ($$(filter x86_64-%,$$($(1)_compiler_preferred_target)),)
+   $(1)_compiler_preferred_target := x86_64-linux-gnu
+  endif
+  ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),)
+   $(1)_compiler_preferred_target := i386-linux-gnu
+  endif
+  ifneq ($$(filter arm-linux-android,$$($(1)_compiler_preferred_target)),)
+   $(1)_compiler_preferred_target := arm-linux-androideabi
+  endif
+ endif
+endef
+
+define cross-compiler-name
+ ifeq ($$(origin CC),file)
+  $(1) := $(2)$(3)
+ else
+  $(1) := $(3)
+  ifeq ($$(_CLANG),true)
+   ifneq ($(strip $(2)),)
+    $(1) := $(3) -target $$(patsubst %-,%,$(2)) -Qunused-arguments -fcolor-diagnostics
+   else
+    $(1) := $(3) -Qunused-arguments -fcolor-diagnostics
+   endif
+  endif
+ endif
+endef
+
+# Work out the host compiler architecture
+$(eval $(call calculate-compiler-preferred-target,host,$(HOST_CC)))
+
+ifeq ($(host_compiler_preferred_target),x86_64-linux-gnu)
+ ifeq ($(ARCH),i386)
+  HOST_PRIMARY_ARCH := host_i386
+  HOST_FORCE_32BIT  := -m32
+ else
+  HOST_PRIMARY_ARCH := host_x86_64
+  HOST_32BIT_ARCH   := host_i386
+  HOST_FORCE_32BIT  := -m32
+ endif
+else
+ifeq ($(host_compiler_preferred_target),i386-linux-gnu)
+ HOST_PRIMARY_ARCH := host_i386
+ HOST_32BIT_ARCH   := host_i386
+else
+ifeq ($(host_compiler_preferred_target),arm-linux-gnueabihf)
+ HOST_PRIMARY_ARCH := host_armhf
+ HOST_32BIT_ARCH   := host_armhf
+else
+ifeq ($(host_compiler_preferred_target),aarch64-linux-gnu)
+ HOST_PRIMARY_ARCH := host_aarch64
+ HOST_32BIT_ARCH   := host_armhf
+else
+ $(error Unknown host compiler target architecture $(host_compiler_preferred_target))
+endif
+endif
+endif
+endif
+
+# Workaround our lack of support for non-Linux HOST_CCs
+ifneq ($(HOST_CC_IS_LINUX),1)
+ $(warning $$(HOST_CC) is non-Linux. Trying to work around.)
+ override HOST_CC := $(HOST_CC) -D__linux__
+ $(eval $(call BothConfigMake,HOST_CC,$(HOST_CC)))
+endif
+
+$(eval $(call BothConfigMake,HOST_PRIMARY_ARCH,$(HOST_PRIMARY_ARCH)))
+$(eval $(call BothConfigMake,HOST_32BIT_ARCH,$(HOST_32BIT_ARCH)))
+$(eval $(call BothConfigMake,HOST_FORCE_32BIT,$(HOST_FORCE_32BIT)))
+
+TARGET_ALL_ARCH :=
+TARGET_PRIMARY_ARCH :=
+TARGET_SECONDARY_ARCH :=
+
+# Work out the target compiler cross triple, and include the corresponding
+# compilers/*.mk file, which sets TARGET_PRIMARY_ARCH and
+# TARGET_SECONDARY_ARCH for that compiler.
+#
+compilers := ../config/compilers
+define include-compiler-file
+ ifeq ($(strip $(1)),)
+  $$(error empty arg passed to include-compiler-file)
+ endif
+ ifeq ($$(wildcard $$(compilers)/$(1).mk),)
+  $$(warning ******************************************************)
+  $$(warning Compiler target '$(1)' not recognised)
+  $$(warning (missing $$(compilers)/$(1).mk file))
+  $$(warning ******************************************************)
+  $$(error Compiler '$(1)' not recognised)
+ endif
+ include $$(compilers)/$(1).mk
+endef
+
+# Check the kernel cross compiler to work out which architecture it targets.
+# We can then tell if CROSS_COMPILE targets a different architecture.
+ifneq ($(origin KERNEL_CROSS_COMPILE),undefined)
+ # First, calculate the value of KERNEL_CROSS_COMPILE as it would be seen by
+ # the main build, so we can check it here in the config stage.
+ $(call one-word-only,KERNEL_CROSS_COMPILE)
+ _kernel_cross_compile := $(if $(filter undef,$(KERNEL_CROSS_COMPILE)),,$(KERNEL_CROSS_COMPILE))
+ # We can take shortcuts with KERNEL_CROSS_COMPILE, as we don't want to
+ # respect CC and we don't support clang in that part currently.
+ _kernel_cross_compile := $(_kernel_cross_compile)gcc
+ # Then check the compiler.
+ $(eval $(call calculate-compiler-preferred-target,target,$(_kernel_cross_compile)))
+ $(eval $(call include-compiler-file,$(target_compiler_preferred_target)))
+ _kernel_primary_arch := $(TARGET_PRIMARY_ARCH)
+else
+ # We can take shortcuts with KERNEL_CROSS_COMPILE, as we don't want to
+ # respect CC and we don't support clang in that part currently.
+ _kernel_cross_compile := $(CROSS_COMPILE)gcc
+ # KERNEL_CROSS_COMPILE will be the same as CROSS_COMPILE, so we don't need
+ # to do the compatibility check.
+ _kernel_primary_arch :=
+endif
+
+$(eval $(call cross-compiler-name,_cc,$(CROSS_COMPILE),$(CC)))
+$(eval $(call cross-compiler-name,_cc_secondary,$(if $(CROSS_COMPILE_SECONDARY),$(CROSS_COMPILE_SECONDARY),$(CROSS_COMPILE)),$(CC_SECONDARY)))
+$(eval $(call calculate-compiler-preferred-target,target,$(_cc)))
+$(eval $(call include-compiler-file,$(target_compiler_preferred_target)))
+
+ifneq ($(SUPPORT_ANDROID_PLATFORM),1)
+ifeq ($(MULTIARCH),1)
+ ifneq ($(MAKECMDGOALS),kbuild)
+  ifneq ($(COMPONENTS),)
+   $(eval $(call calculate-compiler-preferred-target,target_secondary,$(_cc_secondary)))
+   ifneq ($(target_compiler_preferred_target),$(target_secondary_compiler_preferred_target))
+    $(eval $(call include-compiler-file,$(target_secondary_compiler_preferred_target)))
+
+    ifeq ($(TARGET_SECONDARY_ARCH),)
+     $(error $(CROSS_COMPILE_SECONDARY) not supported for MULTIARCH builds)
+    endif
+   endif
+  endif
+ endif
+endif
+endif
+
+define remap-arch
+$(if $(INTERNAL_ARCH_REMAP_$(1)),$(INTERNAL_ARCH_REMAP_$(1)),$(1))
+endef
+
+# Remap 'essentially compatible' architectures so the KM vs UM check
+# isn't too strict. These mixtures are widely supported.
+INTERNAL_ARCH_REMAP_target_armhf := target_armv7-a
+INTERNAL_ARCH_REMAP_target_armel := target_armv7-a
+INTERNAL_ARCH_REMAP_target_mips32r2el := target_mips32el
+INTERNAL_ARCH_REMAP_target_mips32r6el := target_mips32el
+
+# Sanity check: if KERNEL_CROSS_COMPILE was set, it has to target the same
+# architecture as CROSS_COMPILE.
+ifneq ($(_kernel_primary_arch),)
+ ifneq ($(call remap-arch,$(TARGET_PRIMARY_ARCH)),$(call remap-arch,$(_kernel_primary_arch)))
+  $(warning ********************************************************)
+  $(warning Error: Kernel and user-mode cross compilers build for)
+  $(warning different targets)
+  $(warning $(space)$(space)CROSS_COMPILE=$(CROSS_COMPILE))
+  $(warning $(space)$(space)$(space)builds for $(TARGET_PRIMARY_ARCH))
+  $(warning $(space)$(space)KERNEL_CROSS_COMPILE=$(KERNEL_CROSS_COMPILE))
+  $(warning $(space)$(space)$(space)builds for $(_kernel_primary_arch))
+  $(warning ********************************************************)
+  $(error Mismatching kernel and user-mode cross compilers)
+ endif
+endif
+
+ifneq ($(MULTIARCH),32only)
+TARGET_ALL_ARCH += $(TARGET_PRIMARY_ARCH)
+endif
+ifneq ($(MULTIARCH),64only)
+TARGET_ALL_ARCH += $(TARGET_SECONDARY_ARCH)
+endif
+
+$(eval $(call BothConfigMake,TARGET_PRIMARY_ARCH,$(TARGET_PRIMARY_ARCH)))
+$(eval $(call BothConfigMake,TARGET_SECONDARY_ARCH,$(TARGET_SECONDARY_ARCH)))
+$(eval $(call BothConfigMake,TARGET_ALL_ARCH,$(TARGET_ALL_ARCH)))
+$(eval $(call BothConfigMake,TARGET_FORCE_32BIT,$(TARGET_FORCE_32BIT)))
+
+$(info ******* Multiarch build: $(if $(MULTIARCH),yes,no))
+$(info ******* Primary arch:    $(if $(TARGET_PRIMARY_ARCH),$(TARGET_PRIMARY_ARCH),none))
+$(info ******* Secondary arch:  $(if $(TARGET_SECONDARY_ARCH),$(TARGET_SECONDARY_ARCH),none))
+
+# Find the paths to libgcc for the primary and secondary architectures.
+LIBGCC := $(shell $(_cc) -print-libgcc-file-name)
+LIBGCC_SECONDARY := $(shell $(_cc_secondary) $(TARGET_FORCE_32BIT) -print-libgcc-file-name)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-eabi.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-eabi.mk
new file mode 100644
index 0000000..d671ba9
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-eabi.mk
@@ -0,0 +1,2 @@
+# 32-bit ARM EABI compiler
+TARGET_PRIMARY_ARCH := target_armv7-a
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-linux-androideabi.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-linux-androideabi.mk
new file mode 100644
index 0000000..8aaeaad
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/arm-linux-androideabi.mk
@@ -0,0 +1,2 @@
+# 32-bit Android ARM compiler
+include $(compilers)/arm-eabi.mk
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/mips64el-linux-android.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/mips64el-linux-android.mk
new file mode 100644
index 0000000..8777b2a
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/compilers/mips64el-linux-android.mk
@@ -0,0 +1,29 @@
+# 64-bit MIPS R6 little-endian compiler
+IS_KERNEL_32 := 0
+ifneq ($(KERNELDIR),)
+  IS_KERNEL_32 = ($(shell grep -q "CONFIG_MIPS=y" $(KERNELDIR)/.config && echo 1 || echo 0))
+ ifneq ($(ARCH),mips)
+  ifeq ($(IS_KERNEL_32),1)
+   $(warning ******************************************************)
+   $(warning Your kernel appears to be configured for 32-bit MIPS,)
+   $(warning but CROSS_COMPILE (or KERNEL_CROSS_COMPILE) points)
+   $(warning to a 64-bit compiler.)
+   $(warning If you want a 32-bit build, either set CROSS_COMPILE)
+   $(warning to point to a 32-bit compiler, or build with ARCH=mips)
+   $(warning to force 32-bit mode with your existing compiler.)
+   $(warning ******************************************************)
+   $(error Invalid CROSS_COMPILE / kernel architecture combination)
+  endif # CONFIG_X86_32
+ endif # ARCH=mips
+endif # KERNELDIR
+
+# If ARCH=mips is set, force a build for 32-bit only, even though we're
+# using a 64-bit compiler.
+ifeq ($(ARCH),mips)
+ TARGET_PRIMARY_ARCH := target_mips32r6el
+ ifeq ($(IS_KERNEL_32),0)
+        USE_64BIT_COMPAT := 1
+ endif
+else
+ $(error MIPS64 build is not supported)
+endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
index 5cd7a47..dc8c9e7 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
@@ -223,18 +223,55 @@ endif
 # require things like SGXCORE to be set
 ifneq ($(INTERNAL_CLOBBER_ONLY),true)
 
-# These are defined by the core build system, but we might need them
-# earlier to feature-check the compilers
-#
-_CC             := $(if $(filter default,$(origin CC)),gcc,$(CC))
-_CLANG  := \
- $(shell $(TOP)/eurasiacon/build/linux2/tools/cc-check.sh --clang --cc $(_CC))
-ifeq ($(_CLANG),true)
-_CC             := $(_CC) -target $(patsubst %-,%,$(CROSS_COMPILE))
+# GNU Make has builtin values for CC/CXX which we don't want to trust. This
+# is because $(CROSS_COMPILE)$(CC) doesn't always expand to a cross compiler
+# toolchain binary name (e.g. most toolchains have 'gcc' but not 'cc').
+
+ifeq ($(origin CC),default)
+ _CC      := $(CROSS_COMPILE)gcc
+ CC       := gcc
 else
-_CC             := $(CROSS_COMPILE)$(_CC)
+ _CLANG   := $(shell $(TOP)/eurasiacon/build/linux2/tools/cc-check.sh --clang --cc $(CC))
+ _CC      := $(CC)
+ ifeq ($(_CLANG),true)
+  ifneq ($(strip $(CROSS_COMPILE)),)
+    _CC     := $(CC) -target $(patsubst %-,%,$(CROSS_COMPILE)) -Qunused-arguments -fcolor-diagnostics
+  else
+    _CC     := $(CC) -Qunused-arguments -fcolor-diagnostics
+  endif
+ endif
 endif
-HOST_CC ?= gcc
+
+ifeq ($(origin CXX),default)
+ _CXX     := $(CROSS_COMPILE)g++
+ CXX      := g++
+else
+ _CLANGXX := $(shell $(TOP)/eurasiacon/build/linux2/tools/cc-check.sh --clang --cc $(CXX))
+ _CXX    := $(CXX)
+ ifeq ($(_CLANGXX),true)
+   ifneq ($(strip $(CROSS_COMPILE)),)
+    _CXX    := $(CXX) -target $(patsubst %-,%,$(CROSS_COMPILE)) -Qunused-arguments -fcolor-diagnostics
+   else
+    _CXX    := $(CXX) -Qunused-arguments -fcolor-diagnostics
+   endif
+ endif
+endif
+
+CC_SECONDARY ?= $(CC)
+HOST_CC      ?= gcc
+
+# Work out if we are targeting ARM before we start tweaking _CC.
+TARGETING_AARCH64 := $(shell \
+ $(_CC) -dM -E - </dev/null | grep -q __aarch64__ && echo 1)
+
+TARGETING_ARM := $(shell \
+ $(_CC) -dM -E - </dev/null | grep __arm__ >/dev/null 2>&1 && echo 1)
+
+TARGETING_MIPS := $(shell \
+ $(_CC) -dM -E - </dev/null | grep __mips__ >/dev/null 2>&1 && echo 1)
+
+HOST_CC_IS_LINUX := $(shell \
+ $(HOST_CC) -dM -E - </dev/null | grep __linux__ >/dev/null 2>&1 && echo 1)
 
 -include ../config/user-defs.mk
 
@@ -348,6 +385,11 @@ PVRSRV_MODNAME ?= pvrsrvkm
 #
 SUPPORT_PVRSRV_DEVICE_CLASS ?= 1
 
+# Default place for binaries and shared libraries
+BIN_DESTDIR ?= /usr/local/bin
+SHARE_DESTDIR ?= /usr/local/share
+SHLIB_DESTDIR ?= /usr/lib
+
 # The user didn't set CROSS_COMPILE. There's probably nothing wrong
 # with that, but we'll let them know anyway.
 #
@@ -366,12 +408,12 @@ $$(warning *** Setting $(1) via $$(origin $(1)) is deprecated)
 $$(error If you are trying to disable a component, use e.g. EXCLUDED_APIS="opengles1 opengl")
 endif
 endef
-$(foreach _o,SYS_CFLAGS SYS_CXXFLAGS SYS_INCLUDES SYS_COMMON_LDFLAGS SYS_EXE_LDFLAGS SYS_LIB_LDFLAGS SYS_EXE_LDFLAGS_CXX SYS_LIB_LDFLAGS_CXX SUPPORT_EWS SUPPORT_OPENGLES1 SUPPORT_OPENGLES2 SUPPORT_OPENCL SUPPORT_RSCOMPUTE SUPPORT_OPENGL SUPPORT_UNITTESTS SUPPORT_XORG,$(eval $(call sanity-check-support-option-origin,$(_o))))
+$(foreach _o,SYS_CFLAGS SYS_CXXFLAGS SYS_INCLUDES SYS_COMMON_LDFLAGS SYS_EXE_LDFLAGS SYS_LIB_LDFLAGS SYS_EXE_LDFLAGS_CXX SYS_LIB_LDFLAGS_CXX SUPPORT_EWS SUPPORT_NULLWS SUPPORT_OPENGLES1 SUPPORT_OPENGLES2 SUPPORT_OPENCL SUPPORT_OPENGL SUPPORT_SURFACELESS SUPPORT_UNITTESTS SUPPORT_XORG SUPPORT_WAYLAND,$(eval $(call sanity-check-support-option-origin,$(_o))))
 
 # Check for words in EXCLUDED_APIS that aren't understood by the
 # common/apis/*.mk files. This should be kept in sync with all the tests on
 # EXCLUDED_APIS in those files
-_excludable_apis := rscompute opencl opengl opengles1 opengles2 openvg ews unittests xorg xorg_unittests scripts composerhal camerahal memtrackhal
+_excludable_apis := opencl opengl opengles1 opengles2 unittests scripts composerhal camerahal memtrackhal sensorhal
 _excluded_apis := $(subst $(comma),$(space),$(EXCLUDED_APIS))
 _unrecognised := $(strip $(filter-out $(_excludable_apis),$(_excluded_apis)))
 ifneq ($(_unrecognised),)
@@ -386,6 +428,9 @@ override EXCLUDED_APIS := $(filter $(_excludable_apis), $(_excluded_apis))
 #
 -include components.mk
 
+# Set up the host and target compiler.
+include ../config/compiler.mk
+
 # PDUMP needs extra components
 #
 ifeq ($(PDUMP),1)
@@ -399,27 +444,6 @@ KERNEL_COMPONENTS += dbgdrv
 endif
 endif
 
-ifeq ($(SUPPORT_PVR_REMOTE),1)
-ifneq ($(filter pvr2d,$(COMPONENTS)),)
-COMPONENTS += null_pvr2d_remote
-endif
-COMPONENTS += pvrvncsrv
-COMPONENTS += pvrvncinput
-endif
-
-ifeq ($(HAVE_WINDOW_SYSTEM_MAKEFILE),)
-  ifeq ($(WINDOW_SYSTEM_SET_INTERNALLY),)
-   ifneq ($(WINDOW_SYSTEM),)
-    $(error "The WINDOW_SYSTEM build variable is not supported on this platform")
-   endif
-  endif
-  ifneq ($(MESA_EGL),)
-   $(error "The MESA_EGL build variable is not supported on this platform")
-  endif
-  PVR_LWS_NODC :=
-  PVR_LWS_NOBC :=
-endif
-
 ifneq ($(WINDOW_SYSTEM),)
 endif
 ifeq ($(MESA_EGL),1)
@@ -427,11 +451,18 @@ ifeq ($(MESA_EGL),1)
  GLES1_EXTENSION_EGL_IMAGE_EXTERNAL := 1
  GLES2_EXTENSION_EGL_IMAGE_EXTERNAL := 1
 else
- ifeq ($(SUPPORT_BUILD_LWS),1)
- else
+endif
+
+ifneq ($(SUPPORT_BUILD_LWS),)
+ ifneq ($(SYSROOT),)
+  $(info WARNING: You have specified a SYSROOT (or are using a buildroot compiler) and enabled SUPPORT_BUILD_LWS.)
+  $(info          We will ignore the sysroot and will build all required LWS components.)
+  $(info          Unset SUPPORT_BUILD_LWS if this is not what you want.)
  endif
+ override SYSROOT:=
 endif
 
+
 $(if $(filter config,$(D)),$(info Build configuration:))
 
 ################################# CONFIG ####################################
@@ -441,9 +472,11 @@ $(if $(filter config,$(D)),$(info Build configuration:))
 #
 ifneq ($(strip $(KERNELDIR)),)
 include ../kernel_version.mk
-PVRSRV_MODULE_BASEDIR ?= /lib/modules/$(KERNEL_ID)/extra/
-$(eval $(call KernelConfigMake,KERNELDIR,$(KERNELDIR)))
+PVRSRV_MODULE_BASEDIR ?= /lib/modules/$(KERNEL_ID)/extra
+$(eval $(call BothConfigMake,KERNELDIR,$(KERNELDIR)))
 # Needed only by install script
+$(eval $(call BothConfigMake,KERNEL_ID,$(KERNEL_ID)))
+$(eval $(call KernelConfigMake,PVRSRV_MODULE_BASEDIR,$(PVRSRV_MODULE_BASEDIR)))
 $(eval $(call KernelConfigMake,KERNEL_COMPONENTS,$(KERNEL_COMPONENTS)))
 $(eval $(call TunableKernelConfigMake,EXTRA_PVRSRVKM_COMPONENTS,))
 $(eval $(call TunableKernelConfigMake,EXTRA_KBUILD_SOURCE,))
@@ -456,34 +489,35 @@ KERNEL_CROSS_COMPILE ?= $(CROSS_COMPILE)
 $(eval $(call TunableBothConfigMake,KERNEL_CROSS_COMPILE,))
 endif
 
+# Alternatively, allow the CC used for kbuild to be overridden
+# exactly, bypassing any KERNEL_CROSS_COMPILE configuration.
+$(eval $(call TunableBothConfigMake,KERNEL_CC,))
+
 # Check the KERNELDIR has a kernel built.
 VMLINUX := 
-LINUXCFG := $(strip $(wildcard $(KERNELDIR)/.config))
+#$(strip $(wildcard $(KERNELDIR)/vmlinux))
 
-ifneq ($(VMLINUX),)
-ifneq ($(shell file $(KERNELDIR)/vmlinux | grep 64-bit >/dev/null && echo 1),$(shell $(_CC) -dM -E - </dev/null | grep __x86_64__ >/dev/null && echo 1))
-$(error Attempting to build 64-bit DDK against 32-bit kernel, or 32-bit DDK against 64-bit kernel. This is not allowed.)
-endif
-VMLINUX_IS_64BIT := $(shell file $(VMLINUX) | grep 64-bit >/dev/null || echo false)
-VMLINUX_HAS_PAE36 := $(shell cat $(LINUXCFG) | grep CONFIG_X86_PAE=y >/dev/null || echo false)
-VMLINUX_HAS_PAE40 := $(shell cat $(LINUXCFG) | grep CONFIG_ARM_LPAE=y >/dev/null || echo false)
-VMLINUX_HAS_DMA32 := $(shell cat $(LINUXCFG) | grep CONFIG_ZONE_DMA32=y >/dev/null || echo false)
-VMLINUX_HAS_DMA := $(shell cat $(LINUXCFG) | grep CONFIG_ZONE_DMA=y >/dev/null || echo false)
-
-
-# $(error 64BIT=$(VMLINUX_IS_64BIT) PAE36=$(VMLINUX_HAS_PAE36) PAE40=$(VMLINUX_HAS_PAE40) DMA=$(VMLINUX_HAS_DMA) DMA32=$(VMLINUX_HAS_DMA32) MMU36=$(SGX_FEATURE_36BIT_MMU))
-
-ifneq ($(VMLINUX_IS_64BIT),false)
-$(warning $$(KERNELDIR)/vmlinux: Note: vmlinux is 64-bit, which is supported but currently experimental.)
-endif
+ifneq ($(wildcard $(VMLINUX)),)
+ ifneq ($(shell file $(KERNELDIR)/vmlinux | grep 64-bit >/dev/null && echo 1),$(shell $(_CC) -dM -E - </dev/null | grep __x86_64__ >/dev/null && echo 1))
+  $(error Attempting to build 64-bit DDK against 32-bit kernel, or 32-bit DDK against 64-bit kernel. This is not allowed.)
+ endif
+ LINUXCFG := $(strip $(wildcard $(KERNELDIR)/.config))
+ VMLINUX_IS_64BIT := $(shell file $(VMLINUX) | grep 64-bit >/dev/null || echo false)
+ VMLINUX_HAS_PAE36 := $(shell cat $(LINUXCFG) | grep CONFIG_X86_PAE=y >/dev/null || echo false)
+ VMLINUX_HAS_PAE40 := $(shell cat $(LINUXCFG) | grep CONFIG_ARM_LPAE=y >/dev/null || echo false)
+ VMLINUX_HAS_DMA32 := $(shell cat $(LINUXCFG) | grep CONFIG_ZONE_DMA32=y >/dev/null || echo false)
+ ifneq ($(VMLINUX_IS_64BIT),false)
+  $(warning $$(KERNELDIR)/vmlinux: Note: vmlinux is 64-bit, which is supported but currently experimental.)
+ endif
 else
-$(warning $$(KERNELDIR)/vmlinux does not exist. Kbuild may fail.)
-endif
+ $(warning $$(KERNELDIR)/vmlinux does not exist. Kbuild may fail.)
 endif
 
+endif # KERNELDIR
+
 ifneq ($(VMLINUX_HAS_PAE40),false)
-ifeq ($(VMLINUX_HAS_DMA),false)
-$(warning SGX MMUs are currently supported up to only 36 bits max. Your Kernel is built with 40-bit PAE but does not have CONFIG_ZONE_DMA.)
+ifeq ($(VMLINUX_HAS_DMA32),false)
+$(warning SGX MMUs are currently supported up to only 36 bits max. Your Kernel is built with 40-bit PAE but does not have CONFIG_ZONE_DMA32.)
 $(warning This means you must ensure the runtime system has <= 4GB of RAM, or there will be BIG problems...)
 endif 
 endif
@@ -498,8 +532,8 @@ endif
 else
  # Kernel is 32-bit
 ifneq ($(VMLINUX_HAS_PAE36),false)
-ifeq ($(VMLINUX_HAS_DMA),false)
-$(warning SGX is configured with 32-bit MMU. Your Kernel is 32-bit PAE, but does not have CONFIG_ZONE_DMA. )
+ifeq ($(VMLINUX_HAS_DMA32),false)
+$(warning SGX is configured with 32-bit MMU. Your Kernel is 32-bit PAE, but does not have CONFIG_ZONE_DMA32. )
 $(warning This means you must ensure the runtime system has <= 4GB of RAM, or there will be BIG problems...)
 endif
 endif
@@ -509,6 +543,7 @@ endif
 
 # Ideally configured by platform Makefiles, as necessary
 #
+SHADER_DESTDIR := $(SHARE_DESTDIR)/pvr/shaders/
 
 # Invariant options for Linux
 #
@@ -517,7 +552,11 @@ $(eval $(call BothConfigC,LINUX,))
 $(eval $(call BothConfigC,PVR_BUILD_DIR,"\"$(PVR_BUILD_DIR)\""))
 $(eval $(call BothConfigC,PVR_BUILD_TYPE,"\"$(BUILD)\""))
 $(eval $(call BothConfigC,PVRSRV_MODNAME,"\"$(PVRSRV_MODNAME)\""))
+$(eval $(call BothConfigMake,PVRSRV_MODNAME,$(PVRSRV_MODNAME)))
+$(eval $(call BothConfigMake,PVR_BUILD_DIR,$(PVR_BUILD_DIR)))
+$(eval $(call BothConfigMake,PVR_BUILD_TYPE,$(BUILD)))
 
+$(eval $(call TunableBothConfigC,USE_64BIT_COMPAT,))
 $(eval $(call TunableBothConfigC,SGXCORE,))
 $(eval $(call BothConfigC,SGX$(SGXCORE),))
 $(eval $(call BothConfigC,SUPPORT_SGX$(SGXCORE),))
@@ -529,6 +568,7 @@ $(eval $(call TunableBothConfigC,USE_SGX_CORE_REV_HEAD,))
 $(eval $(call BothConfigC,TRANSFER_QUEUE,))
 $(eval $(call BothConfigC,PVR_SECURE_HANDLES,))
 
+
 # Support syncing LISR & MISR. This is required for OS's where
 # on SPM platforms the LISR and MISR can run at the same time and
 # thus during powerdown we need to drain all pending LISRs before
@@ -537,9 +577,15 @@ $(eval $(call KernelConfigC,SUPPORT_LISR_MISR_SYNC))
 
 ifneq ($(DISPLAY_CONTROLLER),)
 $(eval $(call BothConfigC,DISPLAY_CONTROLLER,$(DISPLAY_CONTROLLER)))
+$(eval $(call BothConfigMake,DISPLAY_CONTROLLER,$(DISPLAY_CONTROLLER)))
 endif
 
 ifneq ($(DRM_DISPLAY_CONTROLLER),)
+$(eval $(call KernelConfigMake,DRM_DISPLAY_CONTROLLER,$(DRM_DISPLAY_CONTROLLER)))
+endif
+
+ifneq ($(BUFFERCLASS_MODULE),)
+$(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE)))
 endif
 
 ifneq ($(strip $(KERNELDIR)),)
@@ -590,6 +636,8 @@ $(eval $(call TunableBothConfigC,SUPPORT_HW_RECOVERY,1))
 $(eval $(call TunableBothConfigC,SUPPORT_ACTIVE_POWER_MANAGEMENT,1))
 $(eval $(call TunableBothConfigC,SUPPORT_SGX_HWPERF,1))
 $(eval $(call TunableBothConfigC,SUPPORT_SGX_LOW_LATENCY_SCHEDULING,1))
+$(eval $(call TunableBothConfigC,SUPPORT_SGX_CONTEXT_PRIORITY_PER_THREAD,))
+
 $(eval $(call TunableBothConfigC,SUPPORT_MEMINFO_IDS,))
 $(eval $(call TunableBothConfigC,SUPPORT_SGX_NEW_STATUS_VALS,1))
 $(eval $(call TunableBothConfigC,SUPPORT_PDUMP_MULTI_PROCESS,))
@@ -655,6 +703,15 @@ $(eval $(call TunableKernelConfigC,SUPPORT_PDUMP_SYNC_DEBUG,))
 $(eval $(call TunableKernelConfigC,SUPPORT_PER_SYNC_DEBUG,))
 $(eval $(call TunableKernelConfigC,SUPPORT_FORCE_SYNC_DUMP,))
 
+ifneq ($(filter opengl,$(COMPONENTS)),)
+SUPPORT_OPENGL = 1
+endif
+ifneq ($(filter opengles1,$(COMPONENTS)),)
+endif
+ifneq ($(filter opengles2,$(COMPONENTS)),)
+endif
+ifneq ($(filter opencl,$(COMPONENTS)),)
+endif
 
 
 $(eval $(call TunableBothConfigMake,OPTIM,))
@@ -665,6 +722,25 @@ $(eval $(call TunableBothConfigMake,SUPPORT_PVRSRV_DEVICE_CLASS,))
 
 $(eval $(call TunableKernelConfigMake,TTRACE,))
 
+
+$(if $(USE_CCACHE),$(if $(USE_DISTCC),$(error\
+Enabling both USE_CCACHE and USE_DISTCC at the same time is not supported)))
+
+SUPPORT_SGX_LOW_LATENCY_SCHEDULING ?= 1
+SUPPORT_SGX_CONTEXT_PRIORITY_PER_THREAD ?= 0
+
+ifeq ($(SUPPORT_SGX_CONTEXT_PRIORITY_PER_THREAD),1)
+ifeq ($(SUPPORT_OPENGL),)
+ifeq ($(SUPPORT_SGX_LOW_LATENCY_SCHEDULING),1)
+$(eval $(call BothConfigC,SGX_FEATURE_CONTEXT_PRIORITY_PER_THREAD,))
+else
+$(info SGX_CONTEXT_PRIORITY_PER_THREAD requires Low latency scheduling to be enabled)
+endif
+else
+$(info SGX_CONTEXT_PRIORITY_PER_THREAD requires OpenGL support to be disabled)
+endif
+endif
+
 endif # INTERNAL_CLOBBER_ONLY
 
 export INTERNAL_CLOBBER_ONLY
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
index 311bbb0..29fc365 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
@@ -54,14 +54,6 @@ define one-word-only
 $(if $(filter-out $(firstword $($(1))),$($(1))),$(error In makefile $(THIS_MAKEFILE): $$($(1)) must contain only one word),)
 endef
 
-define target-intermediates-of
-$(addprefix $(TARGET_OUT)/intermediates/$(1)/,$(2))
-endef
-
-define host-intermediates-of
-$(addprefix $(HOST_OUT)/intermediates/$(1)/,$(2))
-endef
-
 define module-library
 $(patsubst lib%.so,%,$(if $($(1)_target),$($(1)_target),$(1).so))
 endef
@@ -71,16 +63,69 @@ define register-module
 INTERNAL_MAKEFILE_FOR_MODULE_$(1) := $(THIS_MAKEFILE)
 endef
 
+define process-module-arch
+MODULE_ARCH := $$(strip $(2))
+include $$(MAKE_TOP)/moduledefs_common.mk
+include $$(MAKE_TOP)/moduledefs/$$(MODULE_ARCH).mk
+include $$(MAKE_TOP)/$$(strip $$($$(THIS_MODULE)_type)).mk
+.SECONDARY: $$(MODULE_INTERMEDIATES_DIR)
+$$(MODULE_INTERMEDIATES_DIR):
+        $$(make-directory)
+MODULE_CLEAN_TARGETS += $$(MODULE_INTERMEDIATES_DIR)
+INTERNAL_TARGETS_FOR_$(1) += $$(MODULE_TARGETS)
+INTERNAL_CLEAN_TARGETS_FOR_$(1) += $$(MODULE_CLEAN_TARGETS)
+INTERNAL_CLOBBER_TARGETS_FOR_$(1) += $$(MODULE_CLEAN_TARGETS) $$(MODULE_CLOBBER_TARGETS) $$(MODULE_TARGETS)
+endef
+
+target_neutral_types := \
+ apk \
+ bison_parser \
+ copy_files \
+ custom \
+ flex_lexer \
+ dex \
+ gen_dispatch \
+ image_header \
+ inline_shaders \
+ java_archive \
+ module_group \
+ pds_header \
+ use_header
+
+doc_types := doc
+
+define calculate-arch-list
+# Work out the target platforms for this module
+MODULE_ARCH_LIST := $(2)
+ifeq ($$(MODULE_ARCH_LIST),)
+ifneq ($$(filter $(1),$(doc_types)),)
+MODULE_ARCH_LIST := doc
+else
+ifneq ($$(filter $(1),$(target_neutral_types)),)
+MODULE_ARCH_LIST := target_neutral
+else
+ifneq ($$(filter $(1),kernel_module),)
+MODULE_ARCH_LIST := $(TARGET_PRIMARY_ARCH)
+else
+MODULE_ARCH_LIST := $(TARGET_ALL_ARCH)
+endif
+endif
+endif
+endif
+endef
+
 define process-module
 THIS_MODULE := $(1)
 THIS_MAKEFILE := $(INTERNAL_MAKEFILE_FOR_MODULE_$(1))
+INTERNAL_TARGETS_FOR_$(1) :=
+INTERNAL_CLEAN_TARGETS_FOR_$(1) :=
+INTERNAL_CLOBBER_TARGETS_FOR_$(1) :=
 include $$(MAKE_TOP)/this_makefile.mk
 $$(call must-be-nonempty,THIS_MAKEFILE)
 $$(call must-be-nonempty,$(1)_type)
-MODULE_HOST_BUILD := $$(if $(filter host_%,$($(1)_type)),true,)
-include $$(MAKE_TOP)/moduledefs.mk
-include $$(MAKE_TOP)/$$(patsubst host_%,%,$($(1)_type)).mk
-INTERNAL_TARGETS_FOR_$(THIS_MODULE) := $(MODULE_TARGETS)
+$$(eval $$(call calculate-arch-list,$$($(1)_type),$$($(1)_arch)))
+INTERNAL_ARCH_LIST_FOR_$(1) := $$(MODULE_ARCH_LIST)
+$$(foreach _m,$$(MODULE_ARCH_LIST),$$(eval $$(call process-module-arch,$(1),$$(_m))))
 endef
 
 # This can be used by module_type.mk files to indicate that they can't be
@@ -100,10 +145,6 @@ $(shell \
         $$CC_CHECK --cc "$(1)" --out "$(2)" $(3))
 endef
 
-define cc-is-64bit
-$(call cc-check,$(1),$(OUT),--64)
-endef
-
 define cc-is-clang
 $(call cc-check,$(patsubst @%,%,$(CC)),$(OUT),--clang)
 endef
@@ -144,10 +185,14 @@ $(call kernel-cc-option,-W$(if $(W),,no-)$(patsubst -W%,%,$(patsubst -Wno-%,%,$(
 endef
 
 define module-info-line
-$(if $(filter modules,$(D)),$(info $(1)),)
+$(if $(filter modules,$(D)),$(info [$(THIS_MODULE)] <$(MODULE_ARCH)> $(1)),)
 endef
 
 # $(call if-exists,A,B) => A if A is a file which exists, otherwise B
 define if-exists
 $(if $(wildcard $(1)),$(1),$(2))
 endef
+
+define unsupported-module-var
+$(if $(strip $($(THIS_MODULE)_$(1))),$(error In makefile $(THIS_MAKEFILE): Setting '$(THIS_MODULE)_$(1)' has no effect, because $(THIS_MODULE) has type $($(THIS_MODULE)_type)))
+endef
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/jz4780_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/jz4780_android/Makefile
new file mode 100644
index 0000000..999c7bf
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/jz4780_android/Makefile
@@ -0,0 +1,62 @@
+# Copyright     (C) Imagination Technologies Limited. All rights reserved.
+#
+# No part of this software, either material or conceptual may be
+# copied or distributed, transmitted, transcribed, stored in a
+# retrieval system or translated into any human or computer
+# language in any form by any means, electronic, mechanical,
+# manual or other-wise, or disclosed to third parties without
+# the express written permission of: Imagination Technologies
+# Limited, HomePark Industrial Estate, Kings Langley,
+# Hertfordshire, WD4 8LZ, UK
+#
+# $Log: $
+#
+
+TARGET_DEVICE ?= ci20
+
+override SGXCORE := 540
+override SGX_CORE_REV := 130
+override SUPPORT_SLC := 1
+
+SGX_DYNAMIC_TIMING_INFO ?= 1
+SGX_FAST_DPM_INIT ?= 1
+
+override SUPPORT_LINUX_USING_WORKQUEUES := 1
+
+PVR_SYSTEM := sgx_jz4780
+HAL_VARIANT := xb4780
+
+# Force-disable camerahal on this board
+override EXCLUDED_APIS := $(EXCLUDED_APIS) camerahal
+
+include ../common/android/paths.mk
+include ../common/android/arch.mk
+include ../common/android/features.mk
+
+# Switch on USSE EDM status debug by default
+PVRSRV_USSE_EDM_STATUS_DEBUG ?= 1
+PVRSRV_DUMP_MK_TRACE ?= 1
+
+# Pre-rotate surfaces in non-screen orientations
+PVR_ANDROID_USE_WINDOW_TRANSFORM_HINT ?= 1
+
+# Disable legacy displayclass support, we will use DRM
+override SUPPORT_PVRSRV_DEVICE_CLASS := 0
+override PVR_LDM_DEVICE_TREE := 1
+override SUPPORT_DMABUF := 1
+
+PVR_ANDROID_COMPOSERHAL ?= drm
+
+include ../config/core.mk
+include ../common/android/extra_config.mk
+
+# Until dri/drm is officially supported, hide the setup in this file
+$(eval $(call BothConfigC,SUPPORT_DRI_DRM,))
+$(eval $(call BothConfigMake,SUPPORT_DRI_DRM,1))
+$(eval $(call KernelConfigC,PVR_DRI_DRM_PLATFORM_DEV,))
+$(eval $(call UserConfigC,PVR_DRM_MODESET_DRIVER_NAME,jz4780))
+$(eval $(call UserConfigC,PVR_DRM_MODESET_MODULE_NAME,dumb))
+$(eval $(call UserConfigMake,PVR_DRM_MODESET_MODULE_NAME,dumb))
+
+# Compile in interception code for USAGE_FB buffers so they use CMA/DMA
+$(eval $(call UserConfigMake,SUPPORT_ANDROID_JZ4780,1))
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/Makefile.template b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/Makefile.template
index 2b49f50..822c3df 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/Makefile.template
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/Makefile.template
@@ -40,8 +40,8 @@
 ### ###########################################################################
 
 # This top-level kbuild makefile builds all the Linux kernel modules in the
-# DDK. To run kbuild, this makefile is copied to $(TARGET_OUT)/kbuild/Makefile
-# and make is invoked in $(TARGET_OUT)/kbuild.
+# DDK. To run kbuild, this makefile is copied to $(TARGET_PRIMARY_OUT)/kbuild/Makefile
+# and make is invoked in $(TARGET_PRIMARY_OUT)/kbuild.
 
 # This makefile doesn't define any kbuild special variables apart from
 # ccflags-y and obj-m. The variables for objects are picked up by including
@@ -56,11 +56,11 @@ include $(OUT)/config_kernel.mk
 
 .SECONDARY:
 
-$(OUT)/target/kbuild/external/%.c: $(EXTRA_KBUILD_SOURCE)/%.c
+$(OUT)/$(TARGET_PRIMARY_ARCH)/kbuild/external/%.c: $(EXTRA_KBUILD_SOURCE)/%.c
         @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
         @if [ ! -h $@ ]; then ln -sf $< $@; fi
 
-$(OUT)/target/kbuild/%.c: $(TOP)/%.c
+$(OUT)/$(TARGET_PRIMARY_ARCH)/kbuild/%.c: $(TOP)/%.c
         @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
         @if [ ! -h $@ ]; then ln -sf $< $@; fi
 
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/kbuild.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/kbuild.mk
index 63542f0..e289a25 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/kbuild.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kbuild/kbuild.mk
@@ -41,7 +41,7 @@
 $(if $(strip $(KERNELDIR)),,$(error KERNELDIR must be set))
 $(call directory-must-exist,$(KERNELDIR))
 
-$(TARGET_OUT)/kbuild/Makefile: $(MAKE_TOP)/kbuild/Makefile.template
+$(TARGET_PRIMARY_OUT)/kbuild/Makefile: $(MAKE_TOP)/kbuild/Makefile.template
         @[ ! -e $(dir $@) ] && mkdir -p $(dir $@) || true
         $(CP) -f $< $@
 
@@ -52,40 +52,36 @@ INTERNAL_KBUILD_OBJECTS := $(foreach _m,$(KERNEL_COMPONENTS),$(if $(INTERNAL_KBU
 INTERNAL_EXTRA_KBUILD_OBJECTS := $(foreach _m,$(EXTRA_PVRSRVKM_COMPONENTS),$(if $(INTERNAL_KBUILD_OBJECTS_FOR_$(_m)),$(INTERNAL_KBUILD_OBJECTS_FOR_$(_m)),$(error BUG: Unknown kbuild module "$(_m)" should have been caught earlier)))
 .PHONY: kbuild kbuild_clean
 
-kbuild: $(TARGET_OUT)/kbuild/Makefile
-        @$(MAKE) -Rr --no-print-directory -C $(KERNELDIR) M=$(abspath $(TARGET_OUT)/kbuild) \
+kbuild: $(TARGET_PRIMARY_OUT)/kbuild/Makefile
+        $(if $(V),,@)$(MAKE) -Rr --no-print-directory -C $(KERNELDIR) \
+                M=$(abspath $(TARGET_PRIMARY_OUT)/kbuild) \
                 INTERNAL_KBUILD_MAKEFILES="$(INTERNAL_KBUILD_MAKEFILES)" \
                 INTERNAL_KBUILD_OBJECTS="$(INTERNAL_KBUILD_OBJECTS)" \
                 INTERNAL_EXTRA_KBUILD_OBJECTS="$(INTERNAL_EXTRA_KBUILD_OBJECTS)" \
                 EXTRA_KBUILD_SOURCE="$(EXTRA_KBUILD_SOURCE)" \
+                TARGET_PRIMARY_ARCH=$(TARGET_PRIMARY_ARCH) \
                 CROSS_COMPILE="$(CCACHE) $(KERNEL_CROSS_COMPILE)" \
                 EXTRA_CFLAGS="$(ALL_KBUILD_CFLAGS)" \
+                CC=$(if $(KERNEL_CC),$(KERNEL_CC),$(KERNEL_CROSS_COMPILE)gcc) \
                 V=$(V) W=$(W) \
                 TOP=$(TOP)
-        @for kernel_module in $(addprefix $(TARGET_OUT)/kbuild/,$(INTERNAL_KBUILD_OBJECTS:.o=.ko)); do \
-                cp $$kernel_module $(TARGET_OUT); \
+        @for kernel_module in $(addprefix $(TARGET_PRIMARY_OUT)/kbuild/,$(INTERNAL_KBUILD_OBJECTS:.o=.ko)); do \
+                cp $$kernel_module $(TARGET_PRIMARY_OUT); \
         done
 
-kbuild_clean: $(TARGET_OUT)/kbuild/Makefile
-        @$(MAKE) -Rr --no-print-directory -C $(KERNELDIR) M=$(abspath $(TARGET_OUT)/kbuild) \
+kbuild_clean: $(TARGET_PRIMARY_OUT)/kbuild/Makefile
+        $(if $(V),,@)$(MAKE) -Rr --no-print-directory -C $(KERNELDIR) \
+                M=$(abspath $(TARGET_PRIMARY_OUT)/kbuild) \
                 INTERNAL_KBUILD_MAKEFILES="$(INTERNAL_KBUILD_MAKEFILES)" \
                 INTERNAL_KBUILD_OBJECTS="$(INTERNAL_KBUILD_OBJECTS)" \
                 INTERNAL_EXTRA_KBUILD_OBJECTS="$(INTERNAL_EXTRA_KBUILD_OBJECTS)" \
                 EXTRA_KBUILD_SOURCE="$(EXTRA_KBUILD_SOURCE)" \
+                TARGET_PRIMARY_ARCH=$(TARGET_PRIMARY_ARCH) \
                 CROSS_COMPILE="$(CCACHE) $(KERNEL_CROSS_COMPILE)" \
                 EXTRA_CFLAGS="$(ALL_KBUILD_CFLAGS)" \
+                CC=$(if $(KERNEL_CC),$(KERNEL_CC),$(KERNEL_CROSS_COMPILE)gcc) \
                 V=$(V) W=$(W) \
                 TOP=$(TOP) clean
 
-kbuild_install: $(TARGET_OUT)/kbuild/Makefile
-        @: $(if $(strip $(DISCIMAGE)),,$(error $$(DISCIMAGE) was empty or unset while trying to use it to set INSTALL_MOD_PATH for modules_install))
-        @$(MAKE) -Rr --no-print-directory -C $(KERNELDIR) M=$(abspath $(TARGET_OUT)/kbuild) \
-                INTERNAL_KBUILD_MAKEFILES="$(INTERNAL_KBUILD_MAKEFILES)" \
-                INTERNAL_KBUILD_OBJECTS="$(INTERNAL_KBUILD_OBJECTS)" \
-                INTERNAL_EXTRA_KBUILD_OBJECTS="$(INTERNAL_EXTRA_KBUILD_OBJECTS)" \
-                EXTRA_KBUILD_SOURCE="$(EXTRA_KBUILD_SOURCE)" \
-                CROSS_COMPILE="$(CCACHE) $(KERNEL_CROSS_COMPILE)" \
-                EXTRA_CFLAGS="$(ALL_KBUILD_CFLAGS)" \
-                INSTALL_MOD_PATH="$(DISCIMAGE)" \
-                V=$(V) W=$(W) \
-                TOP=$(TOP) modules_install
+kbuild_install: install
+kbuild: install_script_km
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kernel_module.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kernel_module.mk
index a0a1289..095fb02 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kernel_module.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/kernel_module.mk
@@ -54,8 +54,20 @@ $(if $(wildcard $(abspath $(MODULE_KBUILD_MAKEFILE))),,$(error In makefile $(THI
 
 # $(THIS_MODULE)_target specifies the name of the kernel module
 $(call must-be-nonempty,$(THIS_MODULE)_target)
+MODULE_TARGETS := $($(THIS_MODULE)_target)
 MODULE_KBUILD_OBJECTS := $($(THIS_MODULE)_target:.ko=.o)
 
+$(call module-info-line,kernel module: $(MODULE_TARGETS))
+
+# Unusually, we define $(THIS_MODULE)_install_path if the user didn't, as we
+# can't use MODULE_INSTALL_PATH in the scripts.mk logic.
+ifeq ($($(THIS_MODULE)_install_path),)
+$(THIS_MODULE)_install_path := \
+ $${MOD_DESTDIR}/$(patsubst $(MODULE_OUT)/%,%,$(MODULE_TARGETS))
+endif
+
+MODULE_INSTALL_PATH := $($(THIS_MODULE)_install_path)
+
 # Here we could maybe include $(MODULE_KBUILD_MAKEFILE) and look at
 # $(MODULE_KBUILD_OBJECTS)-y to see which source files might be built
 
@@ -70,6 +82,12 @@ $(THIS_MODULE):
         @echo "Module $@ is a kbuild module. Run 'make kbuild' to make it"
         @false
 
+$(MODULE_INTERMEDIATES_DIR)/.install: MODULE_TYPE := $($(THIS_MODULE)_type)
+$(MODULE_INTERMEDIATES_DIR)/.install: MODULE_INSTALL_PATH := $(MODULE_INSTALL_PATH)
+$(MODULE_INTERMEDIATES_DIR)/.install: MODULE_TARGETS := $(patsubst $(MODULE_OUT)/%,%,$(MODULE_TARGETS))
+$(MODULE_INTERMEDIATES_DIR)/.install: $(THIS_MAKEFILE) | $(MODULE_INTERMEDIATES_DIR)
+        @echo 'install_file $(MODULE_TARGETS) $(MODULE_INSTALL_PATH) "$(MODULE_TYPE)" 0644 0:0' >$@
+
 ALL_KBUILD_MODULES += $(THIS_MODULE)
 INTERNAL_KBUILD_MAKEFILE_FOR_$(THIS_MODULE) := $(MODULE_KBUILD_MAKEFILE)
 INTERNAL_KBUILD_OBJECTS_FOR_$(THIS_MODULE) := $(MODULE_KBUILD_OBJECTS)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/host_x86_64.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/host_x86_64.mk
new file mode 100644
index 0000000..1130045
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/host_x86_64.mk
@@ -0,0 +1,57 @@
+########################################################################### ###
+#@File
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+### ###########################################################################
+
+MODULE_HOST_BUILD := true
+
+MODULE_CC := $(HOST_CC)
+MODULE_CXX := $(HOST_CXX)
+
+MODULE_HOST_CFLAGS := $(ALL_HOST_CFLAGS) $($(THIS_MODULE)_cflags)
+MODULE_HOST_CXXFLAGS := $(ALL_HOST_CXXFLAGS) $($(THIS_MODULE)_cxxflags)
+MODULE_HOST_LDFLAGS := $(ALL_HOST_LDFLAGS) -L$(MODULE_OUT) $($(THIS_MODULE)_ldflags)
+
+ifneq ($(BUILD),debug)
+ ifeq ($(USE_LTO),1)
+  MODULE_HOST_LDFLAGS := \
+   $(sort $(filter-out -W% -D%,$(ALL_HOST_CFLAGS) $(ALL_HOST_CXXFLAGS))) \
+   $(MODULE_HOST_LDFLAGS)
+ endif
+endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_armv7-a.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_armv7-a.mk
new file mode 100644
index 0000000..bf0979e
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_armv7-a.mk
@@ -0,0 +1,130 @@
+########################################################################### ###
+#@File
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set
+# out in the file called "GPL-COPYING" included in this distribution. If you do
+# not delete the provisions above, a recipient may use your version of this file
+# under the terms of either the MIT license or GPL.
+# 
+# This License is also included in this distribution in the file called
+# "MIT-COPYING".
+# 
+# EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+# PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+### ###########################################################################
+
+MODULE_HOST_BUILD :=
+
+MODULE_CC := $(CC_SECONDARY) -march=armv7-a -mfloat-abi=softfp
+MODULE_CXX := $(CXX_SECONDARY) -march=armv7-a -mfloat-abi=softfp
+
+ifneq ($(BUILD),debug)
+MODULE_CC := $(MODULE_CC) -mthumb
+MODULE_CXX := $(MODULE_CXX) -mthumb
+endif
+
+MODULE_CFLAGS := $(ALL_CFLAGS) $($(THIS_MODULE)_cflags)
+MODULE_CXXFLAGS := $(ALL_CXXFLAGS) $($(THIS_MODULE)_cxxflags)
+MODULE_LDFLAGS := $($(THIS_MODULE)_ldflags) -L$(MODULE_OUT) -Xlinker -rpath-link=$(MODULE_OUT) $(ALL_LDFLAGS)
+
+# Since this is a target module, add system-specific include flags.
+MODULE_INCLUDE_FLAGS := \
+ $(SYS_INCLUDES_RESIDUAL) \
+ $(addprefix -isystem ,$(filter-out $(patsubst -I%,%,$(filter -I%,$(MODULE_INCLUDE_FLAGS))),$(SYS_INCLUDES_ISYSTEM))) \
+ $(MODULE_INCLUDE_FLAGS)
+
+ifneq ($(SUPPORT_ANDROID_PLATFORM),)
+
+_obj := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/obj$(if $(MULTIARCH),_arm,)
+
+# Linker flags used to find system libraries.
+MODULE_SYSTEM_LIBRARY_DIR_FLAGS += \
+ -L$(_obj)/lib \
+ -Xlinker -rpath-link=$(_obj)/lib \
+ -L$(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/lib \
+ -Xlinker -rpath-link=$(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/lib
+ifneq ($(wildcard $(TARGET_ROOT)/product/$(TARGET_DEVICE)/vendor),)
+MODULE_SYSTEM_LIBRARY_DIR_FLAGS += \
+ -L$(TARGET_ROOT)/product/$(TARGET_DEVICE)/vendor/lib \
+ -Xlinker -rpath-link=$(TARGET_ROOT)/product/$(TARGET_DEVICE)/vendor/lib
+else
+MODULE_SYSTEM_LIBRARY_DIR_FLAGS += \
+ -L$(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/vendor/lib \
+ -Xlinker -rpath-link=$(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/vendor/lib
+endif
+
+ifeq ($(NDK_ROOT),)
+
+MODULE_INCLUDE_FLAGS := \
+ -isystem $(ANDROID_ROOT)/bionic/libc/arch-arm/include \
+ -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi/asm-arm \
+ -isystem $(ANDROID_ROOT)/bionic/libm/include/arm \
+ $(MODULE_INCLUDE_FLAGS)
+
+else # NDK_ROOT
+
+_obj := $(NDK_ROOT)/platforms/$(TARGET_PLATFORM)/arch-arm/usr
+
+MODULE_SYSTEM_LIBRARY_DIR_FLAGS := \
+ -L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a \
+ $(MODULE_SYSTEM_LIBRARY_DIR_FLAGS)
+
+endif # NDK_ROOT
+
+MODULE_LDFLAGS += $(MODULE_SYSTEM_LIBRARY_DIR_FLAGS)
+
+MODULE_EXE_LDFLAGS := \
+ -Bdynamic -nostdlib -Wl,-dynamic-linker,/system/bin/linker -lc
+
+MODULE_LIB_LDFLAGS := $(MODULE_EXE_LDFLAGS)
+
+# Keeping it same as C for now
+MODULE_LIB_LDFLAGS_CXX := $(MODULE_EXE_LDFLAGS)
+
+MODULE_EXE_CRTBEGIN := $(_obj)/lib/crtbegin_dynamic.o
+MODULE_EXE_CRTEND := $(_obj)/lib/crtend_android.o
+
+MODULE_LIB_CRTBEGIN := $(_obj)/lib/crtbegin_so.o
+MODULE_LIB_CRTEND := $(_obj)/lib/crtend_so.o
+
+MODULE_LIBGCC := -Wl,--version-script,$(MAKE_TOP)/common/libgcc.lds $(LIBGCC_SECONDARY)
+
+MODULE_ARCH_TAG := $(_obj)
+
+endif # SUPPORT_ANDROID_PLATFORM
+
+ifneq ($(BUILD),debug)
+ifeq ($(USE_LTO),1)
+MODULE_LDFLAGS := \
+ $(sort $(filter-out -W% -D%,$(ALL_CFLAGS) $(ALL_CXXFLAGS))) \
+ $(MODULE_LDFLAGS)
+endif
+endif
+
+MODULE_ARCH_BITNESS := 32
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_mips32r6el.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_mips32r6el.mk
new file mode 100644
index 0000000..0891966
--- /dev/null
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs/target_mips32r6el.mk
@@ -0,0 +1,134 @@
+########################################################################### ###
+#@File
+#@Copyright     Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+#@License       Dual MIT/GPLv2
+# 
+# The contents of this file are subject to the MIT license as set out below.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 2 ("GPL") in which case the provisions
+# of GPL are applicable instead of those above.
+# 
+# If you wish to allow use of your version of this file only under the terms of
+# GPL, and not to allow others to use your version of this file under the terms
+# of the MIT license, indicate your decision by deleting the provisions above
+# and replace them with the notice and other provisions required by GPL as set