Skip to content

Commit b3ffe62

Browse files
author
chopik
committed
linux ARM7 arch for golang build
commit_hash:e9962def09076c0ee2b1b69e79dfe1583ee40e92
1 parent b6f0c52 commit b3ffe62

File tree

56 files changed

+762
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+762
-43
lines changed

build/conf/go.conf

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ elsewhen ($OS_WINDOWS) {
4444
}
4545

4646
# tag:go-specific
47-
GO_TARG_ARCH=unknwon
47+
GO_TARG_ARCH=unknown
4848
when ($ARCH_X86_64) {
4949
GO_TARG_ARCH=amd64
5050
}
@@ -54,6 +54,9 @@ elsewhen ($ARCH_I386) {
5454
elsewhen ($ARCH_ARM64) {
5555
GO_TARG_ARCH=arm64
5656
}
57+
elsewhen ($ARCH_ARM7) {
58+
GO_TARG_ARCH=armv7
59+
}
5760

5861
# tag:go-specific
5962
GO_HOST_TARG_PARAMS=++host-os $GO_HOST_OS ++host-arch $GO_HOST_ARCH ++targ-os $GO_TARG_OS ++targ-arch $GO_TARG_ARCH
@@ -480,6 +483,10 @@ when ($ARCH_ARM64) {
480483
elsewhen ($ARCH_X86_64) {
481484
_GO_TOOLCHAIN_ENV_GOARCH=${env:"GOARCH=amd64"}
482485
}
486+
elsewhen ($ARCH_ARM7) {
487+
_GO_TOOLCHAIN_ENV_GOARCH=${env:"GOARCH=arm"}
488+
_GO_TOOLCHAIN_ENV_GOARCH += ${env:"GOARM=7"}
489+
}
483490

484491
# tag:go-specific
485492
_GO_TOOLCHAIN_ENV_GOOS=unknown
@@ -802,15 +809,15 @@ module _GO_BASE_UNIT: _BASE_UNIT {
802809
_GO_COMPILE_FLAGS_RACE=
803810
_GO_LINK_FLAGS_RACE=
804811
}
805-
812+
806813
when ($SANITIZER_TYPE == "memory") {
807814
_GO_COMPILE_FLAGS_SANITIZERS=-msan
808815
_GO_LINK_FLAGS_SANITAZERS=-msan
809816
}
810817
elsewhen ($SANITIZER_TYPE == "address") {
811818
_GO_COMPILE_FLAGS_SANITIZERS=-asan
812819
_GO_LINK_FLAGS_SANITAZERS=-asan
813-
}
820+
}
814821
otherwise {
815822
_GO_COMPILE_FLAGS_SANITIZERS=
816823
_GO_LINK_FLAGS_SANITAZERS=
@@ -1063,7 +1070,7 @@ MOCKGEN_PACKAGE="mocks"
10631070
### @usage: GO_MOCKGEN_PACKAGE(package)
10641071
###
10651072
### Part of Go mock module definition, source mode.
1066-
### Specifies generated package name, instead of default one "mocks"
1073+
### Specifies generated package name, instead of default one "mocks"
10671074
macro GO_MOCKGEN_PACKAGE(PACKAGE) {
10681075
SET(MOCKGEN_PACKAGE ${PACKAGE})
10691076
}
@@ -1072,7 +1079,7 @@ macro GO_MOCKGEN_PACKAGE(PACKAGE) {
10721079
### @usage: GO_MOCKGEN_REFLECT()
10731080
###
10741081
### Part of Go mock module definition, reflect mode.
1075-
### Creates generator program, expected in `gen` folder
1082+
### Creates generator program, expected in `gen` folder
10761083
macro GO_MOCKGEN_REFLECT() {
10771084
PEERDIR(${GOSTD}/encoding/gob)
10781085
PEERDIR(${GOSTD}/flag)

build/scripts/go_tool.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,12 @@ def do_compile_asm(args):
458458
cmd = [args.go_asm]
459459
cmd += get_trimpath_args(args)
460460
cmd += ['-I', args.output_root, '-I', os.path.join(args.pkg_root, 'include')]
461-
cmd += ['-D', 'GOOS_' + args.targ_os, '-D', 'GOARCH_' + args.targ_arch, '-o', args.output]
461+
cmd += ['-D', 'GOOS_' + args.targ_os]
462+
if args.targ_arch == 'armv7':
463+
cmd += ['-D', 'GOARCH_arm', '-D', 'GOARM_7']
464+
else:
465+
cmd += ['-D', 'GOARCH_' + args.targ_arch]
466+
cmd += ['-o', args.output]
462467

463468
# if compare_versions('1.16', args.goversion) >= 0:
464469
cmd += ['-p', args.import_path]
@@ -661,6 +666,9 @@ def gen_test_main(args, test_lib_args, xtest_lib_args):
661666
my_env['GOROOT'] = ''
662667
my_env['GOPATH'] = go_path_root
663668
my_env['GOARCH'] = args.targ_arch
669+
if args.targ_arch == 'armv7':
670+
my_env['GOARCH'] = 'arm'
671+
my_env['GOARM'] = '7'
664672
my_env['GOOS'] = args.targ_os
665673

666674
tests = []
@@ -866,7 +874,7 @@ def find_ydx_file_name(name, flags):
866874
parser.add_argument('++host-os', choices=['linux', 'darwin', 'windows'], required=True)
867875
parser.add_argument('++host-arch', choices=['amd64', 'arm64'], required=True)
868876
parser.add_argument('++targ-os', choices=['linux', 'darwin', 'windows'], required=True)
869-
parser.add_argument('++targ-arch', choices=['amd64', 'x86', 'arm64'], required=True)
877+
parser.add_argument('++targ-arch', choices=['amd64', 'x86', 'arm64', 'armv7'], required=True)
870878
parser.add_argument('++peers', nargs='*')
871879
parser.add_argument('++non-local-peers', nargs='*')
872880
parser.add_argument('++cgo-peers', nargs='*', default=[])

contrib/go/_std_1.23/src/crypto/aes/ya.make

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,13 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH
2121
gcm_amd64.s
2222
modes.go
2323
)
24+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
25+
SRCS(
26+
block.go
27+
cipher.go
28+
cipher_generic.go
29+
const.go
30+
modes.go
31+
)
2432
ENDIF()
2533
END()
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
GO_LIBRARY()
2-
IF (TRUE)
2+
IF (OS_DARWIN AND ARCH_ARM64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND RACE AND NOT CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND NOT CGO_ENABLED OR OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_X86_64 AND RACE AND NOT CGO_ENABLED OR OS_DARWIN AND ARCH_X86_64 AND NOT RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_X86_64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND NOT CGO_ENABLED OR OS_WINDOWS AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_WINDOWS AND ARCH_X86_64 AND RACE AND NOT CGO_ENABLED OR OS_WINDOWS AND ARCH_X86_64 AND NOT RACE AND CGO_ENABLED OR OS_WINDOWS AND ARCH_X86_64 AND NOT RACE AND NOT CGO_ENABLED)
33
SRCS(
44
elliptic.go
55
nistec.go
66
nistec_p256.go
77
params.go
88
)
9+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
10+
SRCS(
11+
elliptic.go
12+
nistec.go
13+
params.go
14+
)
915
ENDIF()
1016
END()

contrib/go/_std_1.23/src/crypto/internal/bigmod/ya.make

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH
1111
nat_amd64.s
1212
nat_asm.go
1313
)
14+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
15+
SRCS(
16+
nat.go
17+
nat_arm.s
18+
nat_asm.go
19+
)
1420
ENDIF()
1521
END()

contrib/go/_std_1.23/src/crypto/internal/boring/sig/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GO_LIBRARY()
2-
IF (OS_DARWIN AND ARCH_ARM64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND RACE AND NOT CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND NOT CGO_ENABLED)
2+
IF (OS_DARWIN AND ARCH_ARM64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND RACE AND NOT CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
33
SRCS(
44
sig.go
55
sig_other.s

contrib/go/_std_1.23/src/crypto/internal/edwards25519/field/ya.make

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH
1515
fe_arm64_noasm.go
1616
fe_generic.go
1717
)
18+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
19+
SRCS(
20+
fe.go
21+
fe_amd64_noasm.go
22+
fe_arm64_noasm.go
23+
fe_generic.go
24+
)
1825
ENDIF()
1926
END()

contrib/go/_std_1.23/src/crypto/internal/nistec/ya.make

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,15 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH
2525
)
2626

2727
GO_EMBED_PATTERN(p256_asm_table.bin)
28+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
29+
SRCS(
30+
nistec.go
31+
p224.go
32+
p224_sqrt.go
33+
p256.go
34+
p256_ordinv_noasm.go
35+
p384.go
36+
p521.go
37+
)
2838
ENDIF()
2939
END()

contrib/go/_std_1.23/src/crypto/md5/ya.make

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,12 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH
1313
md5block_amd64.s
1414
md5block_decl.go
1515
)
16+
ELSEIF (OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
17+
SRCS(
18+
md5.go
19+
md5block.go
20+
md5block_arm.s
21+
md5block_decl.go
22+
)
1623
ENDIF()
1724
END()

contrib/go/_std_1.23/src/crypto/rand/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ IF (OS_DARWIN AND ARCH_ARM64 AND RACE AND CGO_ENABLED OR OS_DARWIN AND ARCH_ARM6
66
rand_unix.go
77
util.go
88
)
9-
ELSEIF (OS_LINUX AND ARCH_AARCH64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND NOT CGO_ENABLED)
9+
ELSEIF (OS_LINUX AND ARCH_AARCH64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_AARCH64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_X86_64 AND NOT RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND RACE AND NOT CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND CGO_ENABLED OR OS_LINUX AND ARCH_ARM7 AND NOT RACE AND NOT CGO_ENABLED)
1010
SRCS(
1111
rand.go
1212
rand_getrandom.go

0 commit comments

Comments
 (0)