From 92cad5fa4bb4f7662574350df91196bb8017a820 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Thu, 19 Oct 2017 16:55:48 +0100 Subject: spd: Use `ENABLE_ASSERTIONS` instead of `DEBUG` A line in the upstream SPDs is only compiled in in `DEBUG` builds. This line is used to help with assertions and so assertion failures can happen in release builds with assertions enabled. Use `ENABLE_ASSERTIONS` instead of `DEBUG`. This bug was introduced in commit aa61368eb5, which introduced the build option `ENABLE_ASSERTIONS`. Change-Id: I7977df9c89c68677b00099b2a1926fa3cb0937c6 Signed-off-by: Antonio Nino Diaz --- services/spd/opteed/opteed_common.c | 2 +- services/spd/tlkd/tlkd_common.c | 2 +- services/spd/tspd/tspd_common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'services') diff --git a/services/spd/opteed/opteed_common.c b/services/spd/opteed/opteed_common.c index 2693e7d1..e5e2be77 100644 --- a/services/spd/opteed/opteed_common.c +++ b/services/spd/opteed/opteed_common.c @@ -78,7 +78,7 @@ uint64_t opteed_synchronous_sp_entry(optee_context_t *optee_ctx) cm_set_next_eret_context(SECURE); rc = opteed_enter_sp(&optee_ctx->c_rt_ctx); -#if DEBUG +#if ENABLE_ASSERTIONS optee_ctx->c_rt_ctx = 0; #endif diff --git a/services/spd/tlkd/tlkd_common.c b/services/spd/tlkd/tlkd_common.c index 599d7a30..483d45b6 100644 --- a/services/spd/tlkd/tlkd_common.c +++ b/services/spd/tlkd/tlkd_common.c @@ -131,7 +131,7 @@ uint64_t tlkd_synchronous_sp_entry(tlk_context_t *tlk_ctx) cm_set_next_eret_context(SECURE); rc = tlkd_enter_sp(&tlk_ctx->c_rt_ctx); -#if DEBUG +#if ENABLE_ASSERTIONS tlk_ctx->c_rt_ctx = 0; #endif diff --git a/services/spd/tspd/tspd_common.c b/services/spd/tspd/tspd_common.c index 1538232f..de54dbe9 100644 --- a/services/spd/tspd/tspd_common.c +++ b/services/spd/tspd/tspd_common.c @@ -79,7 +79,7 @@ uint64_t tspd_synchronous_sp_entry(tsp_context_t *tsp_ctx) cm_set_next_eret_context(SECURE); rc = tspd_enter_sp(&tsp_ctx->c_rt_ctx); -#if DEBUG +#if ENABLE_ASSERTIONS tsp_ctx->c_rt_ctx = 0; #endif -- cgit v1.2.3