From e2acd7faa5b2cc143ad198a57e9fb30d8f059099 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 20 Jun 2017 17:05:20 +0300 Subject: [PATCH] Prevent abort in register_data_segments for Symbian (Cherry-pick commit a706784 from 'release-7_6' branch.) DATASTART is tested to have a non-null value in GC_register_data_segments, so the macro should not be defined to null even if it is not really used (null value typically means that the corresponding weak symbol is not resolved). * include/private/gcconfig.h [SYMBIAN] (DATASTART, DATAEND): Change to a non-null value (ALIGNMENT). --- include/private/gcconfig.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index a86c28c1..588f7366 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -749,8 +749,8 @@ # define OS_TYPE "SYMBIAN" # define CPP_WORDSZ 32 # define ALIGNMENT 4 -# define DATASTART NULL -# define DATAEND NULL +# define DATASTART (ptr_t)ALIGNMENT /* cannot be null */ +# define DATAEND (ptr_t)ALIGNMENT # endif # define STACK_GRAN 0x1000000 -- 2.40.0