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

xtest: regression_1000: remove unneeded stat.h include #688

Merged
merged 1 commit into from
Aug 4, 2023

Conversation

jonmason
Copy link
Contributor

Hack to work around musl compile error:
In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
optee-test/3.17.0-r0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token
17 | unsigned __unused[2];
| ^

stat.h is not needed, since it is not being used in this file. So removing it.

@jforissier
Copy link
Contributor

This indicates a more fundamental problem which is that optee_os exports some header files to $(out-dir)/export-$(sm)/host_include which really belong in the TA build environment only (that is, when the C library is libutils which is the C library provided by optee_os).
In this case the conflict is caused by compiler.h which defines an __unused macro.

I believe the exports need reviewing and fixing, but in the meantime this patch looks fine to me.

Reviewed-by: Jerome Forissier <[email protected]>

@jenswi-linaro
Copy link
Contributor

Acked-by: Jens Wiklander <[email protected]>

@jforissier
Copy link
Contributor

@jonmason could you please add the Reviewed-by and Acked-by tags and force push? Then I will merge this. Thanks.

Hack to work around musl compile error:
 In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
                  from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
 optee-test/3.17.0-r0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token
    17 |         unsigned __unused[2];
       |                          ^

stat.h is not needed, since it is not being used in this file.  So removing it.

Signed-off-by: Jon Mason <[email protected]>
Reviewed-by: Jerome Forissier <[email protected]>
Acked-by: Jens Wiklander <[email protected]>
@jforissier jforissier merged commit 1013c49 into OP-TEE:master Aug 4, 2023
1 check passed
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 4, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 5, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 5, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 6, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 7, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 8, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 8, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
jonmason added a commit to jonmason/meta-arm that referenced this pull request Aug 8, 2023
Patch was accepted upstream (see
OP-TEE/optee_test#688).  Use the commit that was
backported and specify it as so.

Signed-off-by: Jon Mason <[email protected]>
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.

3 participants