mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

mozjs: Fix do_patch error for mips64-n32

Browse Source 
After mozjs upgrade to 60.5.2 in below commit:
9ca3aad9c mozjs: Upgrade to version 60.x

With below logic in local.conf:
MACHINE ??= "qemumips64"
MULTILIB_GLOBAL_VARIANTS_append = " libn32"
MULTILIBS ?= "multilib:lib32 multilib:libn32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips"
DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32"
require conf/multilib.conf

$ bitbake libn32-mozjs -cpatch
| NOTE: Applying patch '0001-fix-compiling-failure-on-mips64-n32-bsp.patch' (../layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch)
| ERROR: Command Error: 'quilt --quiltrc TOPDIR/tmp/work/mips64-n32-wrsmllibn32-linux-gnun32/libn32-mozjs/60.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
| Applying patch 0001-fix-compiling-failure-on-mips64-n32-bsp.patch
| patching file build/moz.configure/init.configure
| patching file js/src/jit/mips-shared/Architecture-mips-shared.h
| Hunk #1 succeeded at 28 with fuzz 2 (offset 2 lines).
| Hunk #2 FAILED at 95.
| 1 out of 2 hunks FAILED -- rejects in file js/src/jit/mips-shared/Architecture-mips-shared.h
| patching file python/mozbuild/mozbuild/configure/constants.py
| Patch 0001-fix-compiling-failure-on-mips64-n32-bsp.patch does not apply (enforce with -f)

Rework 0001-fix-compiling-failure-on-mips64-n32-bsp.patch
to fix the above do_patch error.

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu
2019-06-19 14:47:45 +08:00
committed by Khem Raj
parent 3e03fe9984
commit fce37fcfa2
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch
+23 -13
View File
@@ -1,6 +1,6 @@
From 5ad700c92224193bfc789f7d53af38fc6f8b8904 Mon Sep 17 00:00:00 2001 From f2f8be496c8e34b4d909b688a95c6f8565201081 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 19 Jul 2018 17:31:35 +0800 Date: Wed, 19 Jun 2019 14:30:44 +0800
Subject: [PATCH] fix compiling failure on mips64-n32 bsp Subject: [PATCH] fix compiling failure on mips64-n32 bsp
- Tweak mips64-n32 with mips32 - Tweak mips64-n32 with mips32
@@ -16,15 +16,18 @@ Subject: [PATCH] fix compiling failure on mips64-n32 bsp
Upstream-Status: Inappropriate [oe specific] Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
--- ---
build/moz.configure/init.configure | 5 ++++- build/moz.configure/init.configure | 5 ++++-
js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++- js/src/jit/mips-shared/Architecture-mips-shared.h | 4 +++-
python/mozbuild/mozbuild/configure/constants.py | 2 +- python/mozbuild/mozbuild/configure/constants.py | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-) 3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 648ac2d..d0bcaf8 100644
--- a/build/moz.configure/init.configure --- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure
@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown @@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown=False):
canonical_cpu = 'mips32' canonical_cpu = 'mips32'
endianness = 'little' if 'el' in cpu else 'big' endianness = 'little' if 'el' in cpu else 'big'
elif cpu in ('mips64', 'mips64el'): elif cpu in ('mips64', 'mips64el'):
@@ -36,26 +39,30 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
endianness = 'little' if 'el' in cpu else 'big' endianness = 'little' if 'el' in cpu else 'big'
elif cpu.startswith('aarch64'): elif cpu.startswith('aarch64'):
canonical_cpu = 'aarch64' canonical_cpu = 'aarch64'
diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h
index e95ffd4..caf83f7 100644
--- a/js/src/jit/mips-shared/Architecture-mips-shared.h --- a/js/src/jit/mips-shared/Architecture-mips-shared.h
+++ b/js/src/jit/mips-shared/Architecture-mips-shared.h +++ b/js/src/jit/mips-shared/Architecture-mips-shared.h
@@ -26,6 +26,8 @@ @@ -28,6 +28,8 @@
#define USES_O32_ABI #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || \
#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) defined(JS_SIMULATOR_MIPS64)
#define USES_N64_ABI #define USES_N64_ABI
+#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32)) +#elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABIN32))
+#define USES_N32_ABI +#define USES_N32_ABI
#else #else
#error "Unsupported ABI" #error "Unsupported ABI"
#endif #endif
@@ -93,7 +95,7 @@ class Registers @@ -94,7 +96,7 @@ class Registers {
ta1 = t5, ta1 = t5,
ta2 = t6, ta2 = t6,
ta3 = t7, ta3 = t7,
-#elif defined(USES_N64_ABI) -#elif defined(USES_N64_ABI)
+#elif defined(USES_N64_ABI) || defined(USES_N32_ABI) +#elif defined(USES_N64_ABI) || defined(USES_N32_ABI)
a4 = r8, a4 = r8,
a5 = r9, a5 = r9,
a6 = r10, a6 = r10,
diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
index 1067b6a..e0f0405 100644
--- a/python/mozbuild/mozbuild/configure/constants.py --- a/python/mozbuild/mozbuild/configure/constants.py
+++ b/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py
@@ -90,8 +90,8 @@ CPU_preprocessor_checks = OrderedDict(( @@ -90,8 +90,8 @@ CPU_preprocessor_checks = OrderedDict((
@@ -68,3 +75,6 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
('sh4', '__sh__'), ('sh4', '__sh__'),
)) ))
--
2.7.4