HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r400:9d5e16586c2c

Few cosmetic changes and lowered optim to -O2...

jeandet -

r400:9d5e16586c2c 3.2.0.22 R3++

parent child

Context file:

r400:9d5e16586c2c

CMakeLists.txt +1 -1

-            cmake_minimum_required (VERSION 2.6)
+            cmake_minimum_required (VERSION 3.6)
             project (LFR_FSW)
             if(NOT CMAKE_BUILD_TYPE)

libgcov/CMakeLists.txt +4 -1

                 gcov-iov.h
                 libgcov.c
             )
+            if(Coverage)
+            #    add_definitions(-DGCOV_USE_EXIT)
+                add_definitions(-DGCOV_ENABLED)
+            endif()
             add_library(gcov STATIC ${LIB_GCOV_SOURCES})
             add_custom_target(gcovr

libgcov/gcov-io.c +2 0

                     gcov_crc32 = crc32;
+            #ifdef GCOV_USE_EXIT
                             if (!gcov_list)
                                 atexit (gcov_exit);
+            #endif
                     info->next = gcov_list;
                     gcov_list = info;

sparc/sparc-rtems.cmake +2 -2

             option(Coverage "Enables code coverage" OFF)
-            set(CMAKE_C_FLAGS_RELEASE "-O3")
+            set(CMAKE_C_FLAGS_RELEASE "-O2")
-            set(CMAKE_C_FLAGS_DEBUG "-O3 -fno-inline")
+            set(CMAKE_C_FLAGS_DEBUG "-O2 -g -fno-inline")
             if(fix-b2bst)

src/CMakeLists.txt +3 -3

-            cmake_minimum_required (VERSION 2.6)
+            cmake_minimum_required (VERSION 3.6)
             project (fsw)
             include(sparc-rtems)
             set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
             set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
             set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-            set(SW_VERSION_N4 "21" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "22" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
             	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
             endif()
-            add_test_cppcheck(fsw STYLE UNUSED_FUNCTIONS POSSIBLE_ERROR MISSING_INCLUDE)
+            #add_test_cppcheck(fsw STYLE UNUSED_FUNCTIONS POSSIBLE_ERROR MISSING_INCLUDE)

src/tc_handler.c +6 0

                  */
                 PRINTF("this is the end!!!\n");
+            #ifdef GCOV_ENABLED
+            #ifndef GCOV_USE_EXIT
+                extern void gcov_exit (void);
+                gcov_exit();
+            #endif
+            #endif
                 exit(0);
                 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages