Skip to content

Conversation

@csegarragonz
Copy link
Collaborator

@csegarragonz csegarragonz commented Oct 8, 2021

In this PR I update the build files and build flags related to SGX. In particular:

  • Re-structure CMakeLists to make them more readable.
  • Remove some config flags that where defined as pre-processor macros.
  • Remove the FAASM_SGX_ATTESTATION macro: even though we keep the sgx/attestation.{c,h} for reference, we elsewhere keep the branch of FAASM_SGX_ATTESTATION = 0.
  • Update the docs acordingly.

The attestation bit will be updated once we merge in the new attesation mechanism.

@csegarragonz csegarragonz added the wasm/wamr-sgx SGX related stuff. label Oct 8, 2021
@csegarragonz csegarragonz self-assigned this Oct 8, 2021
@csegarragonz csegarragonz marked this pull request as draft October 8, 2021 10:32
# NASM configuration
enable_language(ASM_NASM)
set(CMAKE_ASM_NASM_FLAGS -felf64)
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>")
Copy link
Collaborator Author

@csegarragonz csegarragonz Oct 8, 2021

Choose a reason for hiding this comment

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

The diff is quite gnarly, so you may as well directly check the source file here. You may request any change at all in the file (not just comitted changes) as I have basically tinkered with every bit of it.

@csegarragonz csegarragonz marked this pull request as ready for review October 8, 2021 12:06
@csegarragonz csegarragonz requested a review from Shillaker October 8, 2021 14:12
Copy link
Collaborator

@Shillaker Shillaker left a comment

Choose a reason for hiding this comment

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

Awesome (once the tests pass) 👍

@csegarragonz csegarragonz merged commit 444e914 into master Oct 8, 2021
@csegarragonz csegarragonz deleted the update-sgx-cmake branch October 8, 2021 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

wasm/wamr-sgx SGX related stuff.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants