From b8cbd05e6b64a021e30248f30aff5332e8c87fce Mon Sep 17 00:00:00 2001
From: Mazen NEIFER <mazen@nestwave.com>
Date: Thu, 26 Jan 2017 16:47:07 +0100
Subject: [PATCH] Xtensa port: Enable long calls for Xtensa vector table.

Change-Id: I2e4c9ca0742988eb9ab4ec2db7c81bc988212f2c
Signed-off-by: Mazen NEIFER <mazen@nestwave.com>
---
 arch/xtensa/Makefile              | 7 -------
 arch/xtensa/core/Makefile         | 2 +-
 arch/xtensa/core/startup/Makefile | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 7b6d099a670..77d4e7144db 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -21,13 +21,6 @@ ifeq ($(CONFIG_SIMULATOR_XTENSA),y)
 flagBoardType= -DXT_SIMULATOR
 endif
 
-flagLongCall=
-flagALongCall=
-ifeq ($(CONFIG_LONG_CALL),y)
-flagLongCall=-mlongcalls
-flagALongCall=--longcalls
-endif
-
 # Remove compilation flags added by top makefile and which are not supported by xcc and enable.
 KBUILD_CFLAGS := $(filter-out -fno-asynchronous-unwind-tables -fno-omit-frame-pointer,${KBUILD_CFLAGS})
 # Add Xtensa pecific flags
diff --git a/arch/xtensa/core/Makefile b/arch/xtensa/core/Makefile
index 4ce0b3ce3ee..c291c55fadd 100644
--- a/arch/xtensa/core/Makefile
+++ b/arch/xtensa/core/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -I$(srctree)/kernel/unified/include
-asflags-y += -I$(srctree)/kernel/unified/include
+asflags-y += -I$(srctree)/kernel/unified/include --longcalls
 
 ifdef CONFIG_ATOMIC_OPERATIONS_C
 # Use C routines from kernel/nanokernel/atomic.c
diff --git a/arch/xtensa/core/startup/Makefile b/arch/xtensa/core/startup/Makefile
index e68ae7e3223..1a28cd76b6f 100644
--- a/arch/xtensa/core/startup/Makefile
+++ b/arch/xtensa/core/startup/Makefile
@@ -1,2 +1,2 @@
-asflags-y := -c -xassembler-with-cpp $(XTENSA_INCLUDE) $(flagBoardType) $(flagALongCall) -mtext-section-literals
+asflags-y := -c -xassembler-with-cpp $(XTENSA_INCLUDE) $(flagBoardType) -mtext-section-literals --longcalls
 obj-y = reset-vector.o