From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/classes/goarch.bbclass | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'meta/classes/goarch.bbclass') diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index e4e0ca37be..48dc48dabf 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -6,54 +6,54 @@ HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}" HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d)}" HOST_GO386 = "${@go_map_386(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}" HOST_GOMIPS = "${@go_map_mips(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}" -HOST_GOARM_class-native = "7" -HOST_GO386_class-native = "sse2" -HOST_GOMIPS_class-native = "hardfloat" +HOST_GOARM:class-native = "7" +HOST_GO386:class-native = "sse2" +HOST_GOMIPS:class-native = "hardfloat" HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}" TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}" TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d)}" TARGET_GO386 = "${@go_map_386(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}" TARGET_GOMIPS = "${@go_map_mips(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}" -TARGET_GOARM_class-native = "7" -TARGET_GO386_class-native = "sse2" -TARGET_GOMIPS_class-native = "hardfloat" +TARGET_GOARM:class-native = "7" +TARGET_GO386:class-native = "sse2" +TARGET_GOMIPS:class-native = "hardfloat" TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE') == d.getVar('HOST_GOTUPLE')]}" # Use the MACHINEOVERRIDES to map ARM CPU architecture passed to GO via GOARM. # This is combined with *_ARCH to set HOST_GOARM and TARGET_GOARM. BASE_GOARM = '' -BASE_GOARM_armv7ve = '7' -BASE_GOARM_armv7a = '7' -BASE_GOARM_armv6 = '6' -BASE_GOARM_armv5 = '5' +BASE_GOARM:armv7ve = '7' +BASE_GOARM:armv7a = '7' +BASE_GOARM:armv6 = '6' +BASE_GOARM:armv5 = '5' # Go supports dynamic linking on a limited set of architectures. # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go GO_DYNLINK = "" -GO_DYNLINK_arm = "1" -GO_DYNLINK_aarch64 = "1" -GO_DYNLINK_x86 = "1" -GO_DYNLINK_x86-64 = "1" -GO_DYNLINK_powerpc64 = "1" -GO_DYNLINK_powerpc64le = "1" -GO_DYNLINK_class-native = "" -GO_DYNLINK_class-nativesdk = "" +GO_DYNLINK:arm = "1" +GO_DYNLINK:aarch64 = "1" +GO_DYNLINK:x86 = "1" +GO_DYNLINK:x86-64 = "1" +GO_DYNLINK:powerpc64 = "1" +GO_DYNLINK:powerpc64le = "1" +GO_DYNLINK:class-native = "" +GO_DYNLINK:class-nativesdk = "" # define here because everybody inherits this class # -COMPATIBLE_HOST_linux-gnux32 = "null" -COMPATIBLE_HOST_linux-muslx32 = "null" -COMPATIBLE_HOST_powerpc = "null" -COMPATIBLE_HOST_powerpc64 = "null" -COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" +COMPATIBLE_HOST:linux-muslx32 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:powerpc64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" -TUNE_CCARGS_remove = "-march=mips32r2" +TUNE_CCARGS:remove = "-march=mips32r2" SECURITY_NOPIE_CFLAGS ??= "" # go can't be built with ccache: -- cgit v1.2.3-54-g00ecf