diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-14 07:46:23 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-25 14:57:25 -0700 |
commit | be068fec4927666ad84f8955b8cf65e9e25e837f (patch) | |
tree | 2a40d1b8c5cf3dfe03fd665e6eab5acca836134c /meta-xilinx-standalone/recipes-devtools | |
parent | 69e5048019d5e8bd0b57f61ed4238083d947c217 (diff) | |
download | meta-xilinx-be068fec4927666ad84f8955b8cf65e9e25e837f.tar.gz |
meta-xilinx-standalone: various fixes for override syntax changes
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-standalone/recipes-devtools')
7 files changed, 28 insertions, 28 deletions
diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc index 0d647c31..463b796a 100644 --- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | LDGOLD_xilinx-standalone = "" | 1 | LDGOLD:xilinx-standalone = "" |
2 | LDGOLD_ALTS_xilinx-standalone = "" | 2 | LDGOLD_ALTS:xilinx-standalone = "" |
3 | 3 | ||
4 | EXTRA_OECONF:append_xilinx-standalone = " \ | 4 | EXTRA_OECONF:append:xilinx-standalone = " \ |
5 | --disable-gprof \ | 5 | --disable-gprof \ |
6 | --disable-shared \ | 6 | --disable-shared \ |
7 | --enable-lto \ | 7 | --enable-lto \ |
@@ -10,10 +10,10 @@ EXTRA_OECONF:append_xilinx-standalone = " \ | |||
10 | " | 10 | " |
11 | 11 | ||
12 | # CortexR5 and 32-bit arm are both "arm" | 12 | # CortexR5 and 32-bit arm are both "arm" |
13 | EXTRA_OECONF:append_xilinx-standalone:arm = " \ | 13 | EXTRA_OECONF:append:xilinx-standalone:arm = " \ |
14 | --enable-interwork \ | 14 | --enable-interwork \ |
15 | " | 15 | " |
16 | 16 | ||
17 | EXTRA_OECONF:append_xilinx-standalone:microblaze = " \ | 17 | EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ |
18 | --disable-initfini-array \ | 18 | --disable-initfini-array \ |
19 | " | 19 | " |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc index dcc82297..0320a780 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | # Mimic the file gcc-configure-common from the Yocto Project | 1 | # Mimic the file gcc-configure-common from the Yocto Project |
2 | LINKER_HASH_STYLE_xilinx-standalone = "" | 2 | LINKER_HASH_STYLE:xilinx-standalone = "" |
3 | SYMVERS_CONF_xilinx-standalone = "" | 3 | SYMVERS_CONF:xilinx-standalone = "" |
4 | 4 | ||
5 | EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-initfini_array" | 5 | EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-initfini_array" |
6 | 6 | ||
7 | EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-__cxa_atexit" | 7 | EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-__cxa_atexit" |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 50681be2..b4fffe6a 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | |||
@@ -2,9 +2,9 @@ require gcc-configure-xilinx-standalone.inc | |||
2 | require gcc-xilinx-standalone.inc | 2 | require gcc-xilinx-standalone.inc |
3 | 3 | ||
4 | # We want to use the stock multilib configs, when available | 4 | # We want to use the stock multilib configs, when available |
5 | EXTRACONFFUNCS_xilinx-standalone = "" | 5 | EXTRACONFFUNCS:xilinx-standalone = "" |
6 | 6 | ||
7 | EXTRA_OECONF:append_xilinx-standalone = " \ | 7 | EXTRA_OECONF:append:xilinx-standalone = " \ |
8 | --enable-multilib \ | 8 | --enable-multilib \ |
9 | " | 9 | " |
10 | 10 | ||
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend index 22a3e3a9..43d6be73 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend | |||
@@ -2,5 +2,5 @@ require gcc-configure-xilinx-standalone.inc | |||
2 | require gcc-xilinx-standalone.inc | 2 | require gcc-xilinx-standalone.inc |
3 | 3 | ||
4 | # We want to use the stock multilib configs, when available | 4 | # We want to use the stock multilib configs, when available |
5 | EXTRACONFFUNCS_xilinx-standalone = "" | 5 | EXTRACONFFUNCS:xilinx-standalone = "" |
6 | 6 | ||
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index ecfb8bb3..5135fdf6 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend | |||
@@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc | |||
2 | 2 | ||
3 | COMPATIBLE_HOST = "${HOST_SYS}" | 3 | COMPATIBLE_HOST = "${HOST_SYS}" |
4 | 4 | ||
5 | EXTRA_OECONF:append_xilinx-standalone:class-target = " \ | 5 | EXTRA_OECONF:append:xilinx-standalone:class-target = " \ |
6 | --disable-libstdcxx-pch \ | 6 | --disable-libstdcxx-pch \ |
7 | --with-newlib \ | 7 | --with-newlib \ |
8 | --disable-threads \ | 8 | --disable-threads \ |
@@ -11,7 +11,7 @@ EXTRA_OECONF:append_xilinx-standalone:class-target = " \ | |||
11 | --disable-libitm \ | 11 | --disable-libitm \ |
12 | " | 12 | " |
13 | 13 | ||
14 | EXTRA_OECONF:append_xilinx-standalone:aarch64:class-target = " \ | 14 | EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ |
15 | --disable-multiarch \ | 15 | --disable-multiarch \ |
16 | --with-arch=armv8-a \ | 16 | --with-arch=armv8-a \ |
17 | " | 17 | " |
@@ -21,16 +21,16 @@ EXTRA_OECONF:append_xilinx-standalone:aarch64:class-target = " \ | |||
21 | ARM_PROFILE = "aprofile" | 21 | ARM_PROFILE = "aprofile" |
22 | ARM_PROFILE:armrm = "rmprofile" | 22 | ARM_PROFILE:armrm = "rmprofile" |
23 | 23 | ||
24 | EXTRA_OECONF:append_xilinx-standalone:arm:class-target = " \ | 24 | EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \ |
25 | --with-multilib-list=${ARM_PROFILE} \ | 25 | --with-multilib-list=${ARM_PROFILE} \ |
26 | " | 26 | " |
27 | 27 | ||
28 | EXTRA_OECONF:append_xilinx-standalone:armrm:class-target = " \ | 28 | EXTRA_OECONF:append:xilinx-standalone:armrm:class-target = " \ |
29 | --disable-tls \ | 29 | --disable-tls \ |
30 | --disable-decimal-float \ | 30 | --disable-decimal-float \ |
31 | " | 31 | " |
32 | 32 | ||
33 | EXTRA_OECONF:append_xilinx-standalone:microblaze:class-target = " \ | 33 | EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ |
34 | --enable-target-optspace \ | 34 | --enable-target-optspace \ |
35 | --without-long-double-128 \ | 35 | --without-long-double-128 \ |
36 | " | 36 | " |
@@ -38,9 +38,9 @@ EXTRA_OECONF:append_xilinx-standalone:microblaze:class-target = " \ | |||
38 | # Changes local to gcc-runtime... | 38 | # Changes local to gcc-runtime... |
39 | 39 | ||
40 | # Dont build libitm, etc. | 40 | # Dont build libitm, etc. |
41 | RUNTIMETARGET_xilinx-standalone:class-target = "libstdc++-v3" | 41 | RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3" |
42 | 42 | ||
43 | do_install:append_xilinx-standalone:class-target() { | 43 | do_install:append:xilinx-standalone:class-target() { |
44 | # Fixup what gcc-runtime normally would do, we don't want linux directories! | 44 | # Fixup what gcc-runtime normally would do, we don't want linux directories! |
45 | rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux | 45 | rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux |
46 | 46 | ||
@@ -69,6 +69,6 @@ do_install:append_xilinx-standalone:class-target() { | |||
69 | fi | 69 | fi |
70 | } | 70 | } |
71 | 71 | ||
72 | FILES:${PN}-dbg:append_xilinx-standalone:class-target = "\ | 72 | FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\ |
73 | ${libdir}/libstdc++.a-gdb.py \ | 73 | ${libdir}/libstdc++.a-gdb.py \ |
74 | " | 74 | " |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc index ff3402a0..1262bd3c 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | EXTRA_OECONF:append_xilinx-standalone = " \ | 1 | EXTRA_OECONF:append:xilinx-standalone = " \ |
2 | --disable-libstdcxx-pch \ | 2 | --disable-libstdcxx-pch \ |
3 | --with-newlib \ | 3 | --with-newlib \ |
4 | --disable-threads \ | 4 | --disable-threads \ |
@@ -7,7 +7,7 @@ EXTRA_OECONF:append_xilinx-standalone = " \ | |||
7 | --disable-libitm \ | 7 | --disable-libitm \ |
8 | " | 8 | " |
9 | 9 | ||
10 | EXTRA_OECONF:append_xilinx-standalone:aarch64 = " \ | 10 | EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ |
11 | --disable-multiarch \ | 11 | --disable-multiarch \ |
12 | --with-arch=armv8-a \ | 12 | --with-arch=armv8-a \ |
13 | " | 13 | " |
@@ -16,16 +16,16 @@ EXTRA_OECONF:append_xilinx-standalone:aarch64 = " \ | |||
16 | # So only set rmprofile if armrm is defined. | 16 | # So only set rmprofile if armrm is defined. |
17 | ARM_PROFILE = "aprofile" | 17 | ARM_PROFILE = "aprofile" |
18 | ARM_PROFILE:armrm = "rmprofile" | 18 | ARM_PROFILE:armrm = "rmprofile" |
19 | EXTRA_OECONF:append_xilinx-standalone:arm = " \ | 19 | EXTRA_OECONF:append:xilinx-standalone:arm = " \ |
20 | --with-multilib-list=${ARM_PROFILE} \ | 20 | --with-multilib-list=${ARM_PROFILE} \ |
21 | " | 21 | " |
22 | 22 | ||
23 | EXTRA_OECONF:append_xilinx-standalone:armrm = " \ | 23 | EXTRA_OECONF:append:xilinx-standalone:armrm = " \ |
24 | --disable-tls \ | 24 | --disable-tls \ |
25 | --disable-decimal-float \ | 25 | --disable-decimal-float \ |
26 | " | 26 | " |
27 | 27 | ||
28 | EXTRA_OECONF:append_xilinx-standalone:microblaze = " \ | 28 | EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ |
29 | --enable-target-optspace \ | 29 | --enable-target-optspace \ |
30 | --without-long-double-128 \ | 30 | --without-long-double-128 \ |
31 | " | 31 | " |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend index a9a389b2..861b3f9c 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend | |||
@@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc | |||
2 | 2 | ||
3 | COMPATIBLE_HOST = "${HOST_SYS}" | 3 | COMPATIBLE_HOST = "${HOST_SYS}" |
4 | 4 | ||
5 | python do_multilib_install_xilinx-standalone:class-target () { | 5 | python do_multilib_install:xilinx-standalone:class-target () { |
6 | pass | 6 | pass |
7 | } | 7 | } |
8 | 8 | ||
@@ -19,11 +19,11 @@ standalone_fixup () { | |||
19 | } | 19 | } |
20 | 20 | ||
21 | FIXUP_FUNCTION = "" | 21 | FIXUP_FUNCTION = "" |
22 | FIXUP_FUNCTION_xilinx-standalone:class-target = " standalone_fixup" | 22 | FIXUP_FUNCTION:xilinx-standalone:class-target = " standalone_fixup" |
23 | 23 | ||
24 | do_install[postfuncs] .= "${FIXUP_FUNCTION}" | 24 | do_install[postfuncs] .= "${FIXUP_FUNCTION}" |
25 | 25 | ||
26 | FILES:${PN}-dev:append_xilinx-standalone:class-target = " \ | 26 | FILES:${PN}-dev:append:xilinx-standalone:class-target = " \ |
27 | ${libdir}/*.a \ | 27 | ${libdir}/*.a \ |
28 | ${libdir}/*.o \ | 28 | ${libdir}/*.o \ |
29 | " | 29 | " |