Remove IA2_TRACE_EXIT references

Author: oinoom

cmake/define-test.cmake

@@ -17,7 +17,7 @@ function(define_shared_lib)
     set(options NEEDS_LD_WRAP NO_UBSAN)
     set(oneValueArgs LIBNAME PKEY)
     set(multiValueArgs SRCS INCLUDE_DIR UNWRAPPED_INCLUDE_DIRS
-        UNWRAPPED_LIBRARY_DIRS UNWRAPPED_LIBS EXTRA_REWRITER_ARGS)
+        UNWRAPPED_LIBRARY_DIRS UNWRAPPED_LIBS)
     cmake_parse_arguments(SHARED_LIB "${options}" "${oneValueArgs}"
                           "${multiValueArgs}" ${ARGN})
 
@@ -51,7 +51,6 @@ function(define_shared_lib)
         LIBRARIES ${SHARED_LIB_UNWRAPPED_LIBS}
         SOURCES ${SHARED_LIB_SRCS}
         INCLUDE_DIRECTORIES ${SHARED_LIB_UNWRAPPED_INCLUDE_DIRS} ${RELATIVE_INCLUDE_DIR}
-        EXTRA_REWRITER_ARGS ${SHARED_LIB_EXTRA_REWRITER_ARGS}
     )
 
     target_include_directories(${LIBNAME} PUBLIC
@@ -91,7 +90,7 @@ function(define_test)
     set(options NEEDS_LD_WRAP NOT_IN_CHECK_IA2 NO_LIBS NO_UBSAN CRITERION_TEST WITHOUT_SANDBOX TYPE_REGISTRY)
     set(oneValueArgs PKEY NAME)
     set(multiValueArgs LIBS SRCS INCLUDE_DIR
-        UNWRAPPED_INCLUDE_DIRS UNWRAPPED_LIBRARY_DIRS UNWRAPPED_LIBS EXTRA_REWRITER_ARGS)
+        UNWRAPPED_INCLUDE_DIRS UNWRAPPED_LIBRARY_DIRS UNWRAPPED_LIBS)
     cmake_parse_arguments(DEFINE_TEST "${options}" "${oneValueArgs}"
                           "${multiValueArgs}" ${ARGN})
 
@@ -176,7 +175,6 @@ function(define_test)
         LIBRARIES ${DEFINE_TEST_UNWRAPPED_LIBS} ${DEFINE_TEST_LIBS}
         SOURCES ${DEFINE_TEST_SRCS}
         INCLUDE_DIRECTORIES ${DEFINE_TEST_UNWRAPPED_INCLUDE_DIRS} ${RELATIVE_INCLUDE_DIR}
-        EXTRA_REWRITER_ARGS ${DEFINE_TEST_EXTRA_REWRITER_ARGS}
     )
 
     if(ADD_SANDBOX_DEP)

cmake/ia2.cmake

@@ -23,7 +23,7 @@ function(add_ia2_compartment NAME TYPE)
   # Parse options
   set(options ENABLE_UBSAN)
   set(oneValueArgs PKEY)
-  set(multiValueArgs LIBRARIES SOURCES INCLUDE_DIRECTORIES EXTRA_REWRITER_ARGS)
+  set(multiValueArgs LIBRARIES SOURCES INCLUDE_DIRECTORIES)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}"
     "${multiValueArgs}" ${ARGN})
 
@@ -49,9 +49,6 @@ function(add_ia2_compartment NAME TYPE)
     IA2_ENABLE=1
     PKEY=${ARG_PKEY}
   )
-  if(IA2_TRACE_EXIT)
-    target_compile_definitions(${NAME} PRIVATE IA2_TRACE_EXIT=1)
-  endif()
   set_target_properties(${NAME} PROPERTIES PKEY ${ARG_PKEY})
   target_compile_options(${NAME} PRIVATE
     "-Werror=incompatible-pointer-types"
@@ -80,7 +77,7 @@ function(add_ia2_compartment NAME TYPE)
 
   if("${TYPE}" STREQUAL "EXECUTABLE")
     # Create and link call gates
-    add_ia2_call_gates(${NAME} LIBRARIES ${ARG_LIBRARIES} EXTRA_REWRITER_ARGS ${ARG_EXTRA_REWRITER_ARGS})
+    add_ia2_call_gates(${NAME} LIBRARIES ${ARG_LIBRARIES})
   endif()
 endfunction()
 
@@ -150,9 +147,6 @@ function(create_compile_commands NAME TYPE)
     IA2_ENABLE=0
     PKEY=${ARG_PKEY}
   )
-  if(IA2_TRACE_EXIT)
-    target_compile_definitions(${COMPILE_COMMAND_TARGET} PRIVATE IA2_TRACE_EXIT=1)
-  endif()
   # Copy target properties from the real target. We might need to add more properties.
   target_link_libraries(${COMPILE_COMMAND_TARGET} PRIVATE $<TARGET_PROPERTY:${NAME},LINK_LIBRARIES>)
   target_include_directories(${COMPILE_COMMAND_TARGET} PRIVATE ${INCLUDE_DIRECTORIES})
@@ -224,7 +218,7 @@ function(add_ia2_call_gates NAME)
   # Parse options
   set(options "")
   set(oneValueArgs "")
-  set(multiValueArgs LIBRARIES EXTRA_REWRITER_ARGS)
+  set(multiValueArgs LIBRARIES)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}"
     "${multiValueArgs}" ${ARGN})
 
@@ -328,7 +322,6 @@ function(add_ia2_call_gates NAME)
         # Set the build path so the rewriter can find the compile_commands JSON
         -p ${CMAKE_BINARY_DIR}
         ${SYSROOT_FLAG}
-        ${ARG_EXTRA_REWRITER_ARGS}
         ${SOURCES}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     # dependencies on custom targets (i.e. the rewriter) do not re-run this