1580126 - Fix build failure on aarch64_be while building freebl/gcm

Status: RESOLVED FIXED

(NSS :: Build, defect, P1)

Description

[Giulio Benetti]

User Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36

Steps to reproduce:

Here is Buildroot autobuilder build failure:
http://autobuild.buildroot.net/results/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00

Actual results:

Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-aarch64.o: In function gcm_HashMult_hw': /home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm-aarch64.c:30: multiple definition ofgcm_HashMult_hw'
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm.o:/home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm.c:50: first defined here
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-aarch64.o: In function gcm_HashMult_hw': /home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm-aarch64.c:30: multiple definition ofgcm_HashWrite_hw'
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm.o:/home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm.c:400: first defined here
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-aarch64.o: In function gcm_HashMult_hw': /home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm-aarch64.c:30: multiple definition ofgcm_HashInit_hw'
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm.o:/home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm.c:400: first defined here
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm-aarch64.o: In function gcm_HashMult_hw': /home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm-aarch64.c:30: multiple definition ofgcm_HashZeroX_hw'
Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/gcm.o:/home/giuliobenetti/br_reproduce/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00/output/build/libnss-3.46/nss/lib/freebl/gcm.c:400: first defined here
collect2: error: ld returned 1 exit status

Comment 1

[Giulio Benetti]

Attachment: 0001-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch

This Arm speedup should work with big endian too.

Comment 2

[J.C. Jones [:jcj] (he/him)]

Comment on attachment 9091683 [details] [diff] [review]
0001-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch

Review of attachment 9091683 [details] [diff] [review]:
-----------------------------------------------------------------

Kevin, I remember there was a good reason for that check, can you take a look?

Comment 3

[Kevin Jacobs [:kjacobs]]

Thanks for the report.

It looks like this is caused by the differing ifdef conditions between gcm.c (for USE_HW_GCM) and gcm-aarch64.c. The original patch didn't enable this for big endian as the submitter had no way to test it (nor do we currently).

Giulio, would you like to update the patch to check IS_LITTLE_ENDIAN and __aarch64__ in gcm-aarch64.c?

Comment 4

[Giulio Benetti]

(In reply to Kevin Jacobs [:kjacobs] from comment #3)

Thanks for the report.

It looks like this is caused by the differing ifdef conditions between gcm.c (for USE_HW_GCM) and gcm-aarch64.c. The original patch didn't enable this for big endian as the submitter had no way to test it (nor do we currently).

Giulio, would you like to update the patch to check IS_LITTLE_ENDIAN and __aarch64__ in gcm-aarch64.c?

Sure I'm going to do that today.

Comment 5

[Giulio Benetti]

Attachment: 0001-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch

Comment 6

[Giulio Benetti]

Oops in commit log there are 2 SoBs.
Can you reword it when applying?
Thanks

Comment 7

[Kevin Jacobs [:kjacobs]]

My apologies for the slow response; the flag cleared before I saw this pop up in my queue.

This looks good and yes, we can take care of the commit message fixup. I'll assume you want to keep "Giulio Benetti <[e-mail]>" per your commit history, let us know if otherwise.

Thanks.

Comment 8

[J.C. Jones [:jcj] (he/him)]

https://hg.mozilla.org/projects/nss/rev/fa0d958de0c3cf99a7ec66e819b128c7bc88ff9f

Comment 9

[Giulio Benetti]

(In reply to Kevin Jacobs [:kjacobs] from comment #7)

My apologies for the slow response; the flag cleared before I saw this pop up in my queue.
No problem
This looks good and yes, we can take care of the commit message fixup. I'll assume you want to keep "Giulio Benetti <[e-mail]>" per your commit history, let us know if otherwise.
Yes, that's ok. It will be for next time :)
Thanks.
Thank you