diff --git a/mindspore/core/utils/log_adapter.h b/mindspore/core/utils/log_adapter.h index 4b50be12b8bfb8ad7ac4981bbd7148663c3183f0..7aba9194e95e71ae593aa8b1589d012db37460f5 100644 --- a/mindspore/core/utils/log_adapter.h +++ b/mindspore/core/utils/log_adapter.h @@ -147,7 +147,7 @@ class LogWriter { LogWriter(const LocationInfo &location, MsLogLevel log_level, SubModuleId submodule, ExceptionType excp_type = NoExceptionType) - : location_(location), log_level_(log_level), exception_type_(excp_type) {} + : location_(location), log_level_(log_level), submodule_(submodule), exception_type_(excp_type) {} ~LogWriter() = default; void operator<(const LogStream &stream) const noexcept __attribute__((visibility("default"))); @@ -161,6 +161,7 @@ class LogWriter { LocationInfo location_; MsLogLevel log_level_; + SubModuleId submodule_; ExceptionType exception_type_; inline static ExceptionHandler exception_handler_ = nullptr; diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 42acb906bdc9a67b962c70db7af902115638fc2d..f1343e8536087c437f90cc06dd0ddd75ec757881 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -65,21 +65,22 @@ set(CMAKE_VERBOSE_MAKEFILE on) add_compile_definitions(USE_ANDROID_LOG) add_compile_definitions(NO_DLIB) add_compile_options(-fPIC) - -if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDebug -g") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") -else () - ## enable for binscope for release - set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") - if (NOT WIN32) - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_EXE_LINKER_FLAGS}") - endif() - string(REPLACE " -g " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +if (NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDebug -g") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") + else () + ## enable for binscope for release + set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") + if (NOT WIN32) + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_SHARED_LINKER_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_EXE_LINKER_FLAGS}") + endif() + string(REPLACE " -g " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif () endif () if (BUILD_DEVICE) @@ -208,4 +209,4 @@ if (BUILD_DEVICE) endif () endif () -include(${TOP_DIR}/cmake/package_lite.cmake) \ No newline at end of file +include(${TOP_DIR}/cmake/package_lite.cmake)