summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@kernel.crashing.org>2020-02-04 15:06:30 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-06 12:16:34 +0000
commitcdcacf26ec95cfa874b2060c059478666956cdca (patch)
treea720420ff80d92752a53bfe2857f7125ed9d13ab
parentd6b0154a4c1e897d6cd2f815c13ad9d6f34c1355 (diff)
downloadpoky-cdcacf26ec95cfa874b2060c059478666956cdca.tar.gz
microblaze: Adjust Linux items from microblazeeb to microblaze
Due to recent changes to the tune, in order to match config.guess, the name of the big-endian microblaze architecture was changes to 'microblaze'. (From OE-Core rev: 6f6a6bbac684ead3fe6d070d61f17c2f611a2c87) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/meson.bbclass2
-rw-r--r--meta/classes/siteinfo.bbclass3
-rw-r--r--meta/lib/oe/elf.py3
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h (renamed from meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h)0
4 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 001602bd04..06034e8b47 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -57,7 +57,7 @@ def meson_cpu_family(var, d):
57 return 'mips64' 57 return 'mips64'
58 elif re.match(r"i[3-6]86", arch): 58 elif re.match(r"i[3-6]86", arch):
59 return "x86" 59 return "x86"
60 elif arch == "microblazeel" or arch == "microblazeeb": 60 elif arch == "microblazeel":
61 return "microblaze" 61 return "microblaze"
62 else: 62 else:
63 return arch 63 return arch
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index d62aaac0f0..1a048c053f 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -35,7 +35,6 @@ def siteinfo_data_for_machine(arch, os, d):
35 "lm32": "endian-big bit-32", 35 "lm32": "endian-big bit-32",
36 "m68k": "endian-big bit-32", 36 "m68k": "endian-big bit-32",
37 "microblaze": "endian-big bit-32 microblaze-common", 37 "microblaze": "endian-big bit-32 microblaze-common",
38 "microblazeeb": "endian-big bit-32 microblaze-common",
39 "microblazeel": "endian-little bit-32 microblaze-common", 38 "microblazeel": "endian-little bit-32 microblaze-common",
40 "mips": "endian-big bit-32 mips-common", 39 "mips": "endian-big bit-32 mips-common",
41 "mips64": "endian-big bit-64 mips-common", 40 "mips64": "endian-big bit-64 mips-common",
@@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d):
89 "arm-linux-musleabi": "arm-linux", 88 "arm-linux-musleabi": "arm-linux",
90 "armeb-linux-gnueabi": "armeb-linux", 89 "armeb-linux-gnueabi": "armeb-linux",
91 "armeb-linux-musleabi": "armeb-linux", 90 "armeb-linux-musleabi": "armeb-linux",
92 "microblazeeb-linux" : "microblaze-linux",
93 "microblazeeb-linux-musl" : "microblaze-linux",
94 "microblazeel-linux" : "microblaze-linux", 91 "microblazeel-linux" : "microblaze-linux",
95 "microblazeel-linux-musl" : "microblaze-linux", 92 "microblazeel-linux-musl" : "microblaze-linux",
96 "mips-linux-musl": "mips-linux", 93 "mips-linux-musl": "mips-linux",
diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py
index 2ed614f652..df0a4593fa 100644
--- a/meta/lib/oe/elf.py
+++ b/meta/lib/oe/elf.py
@@ -22,7 +22,6 @@ def machine_dict(d):
22 "mips": ( 8, 0, 0, False, 32), 22 "mips": ( 8, 0, 0, False, 32),
23 "mipsel": ( 8, 0, 0, True, 32), 23 "mipsel": ( 8, 0, 0, True, 32),
24 "microblaze": (189, 0, 0, False, 32), 24 "microblaze": (189, 0, 0, False, 32),
25 "microblazeeb":(189, 0, 0, False, 32),
26 "microblazeel":(189, 0, 0, True, 32), 25 "microblazeel":(189, 0, 0, True, 32),
27 "powerpc": (20, 0, 0, False, 32), 26 "powerpc": (20, 0, 0, False, 32),
28 "riscv32": (243, 0, 0, True, 32), 27 "riscv32": (243, 0, 0, True, 32),
@@ -60,7 +59,6 @@ def machine_dict(d):
60 "sh4": (42, 0, 0, True, 32), 59 "sh4": (42, 0, 0, True, 32),
61 "sparc": ( 2, 0, 0, False, 32), 60 "sparc": ( 2, 0, 0, False, 32),
62 "microblaze": (189, 0, 0, False, 32), 61 "microblaze": (189, 0, 0, False, 32),
63 "microblazeeb":(189, 0, 0, False, 32),
64 "microblazeel":(189, 0, 0, True, 32), 62 "microblazeel":(189, 0, 0, True, 32),
65 }, 63 },
66 "linux-musl" : { 64 "linux-musl" : {
@@ -81,7 +79,6 @@ def machine_dict(d):
81 "mips64": ( 8, 0, 0, False, 64), 79 "mips64": ( 8, 0, 0, False, 64),
82 "mips64el": ( 8, 0, 0, True, 64), 80 "mips64el": ( 8, 0, 0, True, 64),
83 "microblaze": (189, 0, 0, False, 32), 81 "microblaze": (189, 0, 0, False, 32),
84 "microblazeeb":(189, 0, 0, False, 32),
85 "microblazeel":(189, 0, 0, True, 32), 82 "microblazeel":(189, 0, 0, True, 32),
86 "riscv32": (243, 0, 0, True, 32), 83 "riscv32": (243, 0, 0, True, 32),
87 "riscv64": (243, 0, 0, True, 64), 84 "riscv64": (243, 0, 0, True, 64),
diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h
index 63232fdfa6..63232fdfa6 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
+++ b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h