Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: use CFLAGS32/CFLAGS64 when building in-tree TAs #5007

Merged
merged 1 commit into from
Dec 1, 2021

Conversation

jforissier
Copy link
Contributor

Commit 19fdfcf ("build: ldelf and TAs can rely on CFLAGS32/CFLAGS64")
only partially implements what is mentioned in the commit description.
The ldelf part is OK, but in-tree TAs still don't use CFLAGS32 or
CFLAGS64. The reason is that the submodule name $(sm) is not ta_arm32 or
ta_arm64 like for TAs build with the "dev kit". Instead, $(sm) is the
name of the directory (such as "avb" for core/ta/avb, "pkcs11" for
core/ta/pkcs11, etc.). Therefore, it is not arch-bits-ta_arm32 or
arch-bits-ta_arm64 that needs to be set but arch-bits-$(sm).

Fixes: 19fdfcf ("build: ldelf and TAs can rely on CFLAGS32/CFLAGS64")
Signed-off-by: Jerome Forissier jerome@forissier.org

@jforissier
Copy link
Contributor Author

@rfs613 would you mind checking if this fixes the issue you reported? If it does, feel free to give a Tested-by: and also a Reported-by: if you want (no obligation).

@jforissier
Copy link
Contributor Author

I am restarting IBART which reported an error that doesn't seem related to this change (random timeout?)

  1375:  o regression_2004.4.2 UDP Socket recv
  1376:  regression_2000.c:697: socket_recv(session, sh, buf, &blen, 0xFFFFFFFF, &ret_orig) has an unexpected value: 0xf1007003 = TEE_ISOCKET_ERROR_TIMEOUT, expected 0x0 = TEEC_SUCCESS
  1377:  regression_2000.c:779: test_2004_send_recv(c, &server_iostate, &local_iostate, &session, &sh, 64, 32) has an unexpected value: 0x0 = false, expected 0x1 = true
  1378:    regression_2004.4.2 FAILED

@rfs613
Copy link
Contributor

rfs613 commented Nov 29, 2021

@rfs613 would you mind checking if this fixes the issue you reported? If it does, feel free to give a Tested-by: and also a Reported-by: if you want (no obligation).

Indeed that does the trick, thanks!

Tested-by: Ralph Siemsen <ralph.siemsen@linaro.org>

Copy link
Contributor

@etienne-lms etienne-lms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>

@jenswi-linaro
Copy link
Contributor

Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Commit 19fdfcf ("build: ldelf and TAs can rely on CFLAGS32/CFLAGS64")
only partially implements what is mentioned in the commit description.
The ldelf part is OK, but in-tree TAs still don't use CFLAGS32 or
CFLAGS64. The reason is that the submodule name $(sm) is not ta_arm32 or
ta_arm64 like for TAs build with the "dev kit". Instead, $(sm) is the
name of the directory (such as "avb" for core/ta/avb, "pkcs11" for
core/ta/pkcs11, etc.). Therefore, it is not arch-bits-ta_arm32 or
arch-bits-ta_arm64 that needs to be set but arch-bits-$(sm).

Fixes: 19fdfcf ("build: ldelf and TAs can rely on CFLAGS32/CFLAGS64")
Signed-off-by: Jerome Forissier <jerome@forissier.org>
Tested-by: Ralph Siemsen <ralph.siemsen@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
@jforissier jforissier merged commit 728777a into OP-TEE:master Dec 1, 2021
@jforissier jforissier deleted the in-tree-ta-CFLAGSxx branch December 1, 2021 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants