diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-05-04 08:25:43 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-05-04 08:25:43 +0000 |
| commit | 5666889d8b09fea72fe1aa51944c982acdacefef (patch) | |
| tree | 0c2dca8bf51f6cc2880f5d903936ed29084c6121 /os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s | |
| parent | e34eff0df15d8a1e28463bccc1c75b337ace9fb5 (diff) | |
| download | ChibiOS-5666889d8b09fea72fe1aa51944c982acdacefef.tar.gz ChibiOS-5666889d8b09fea72fe1aa51944c982acdacefef.tar.bz2 ChibiOS-5666889d8b09fea72fe1aa51944c982acdacefef.zip | |
Fixed bug #1028.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12776 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
Diffstat (limited to 'os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s')
| -rw-r--r-- | os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s b/os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s index b0de85ce1..6385ac514 100644 --- a/os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s +++ b/os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s @@ -64,7 +64,7 @@ ICSR_PENDSVSET SET 0x10000000 EXTERN chThdExit
EXTERN chSysHalt
EXTERN chSchDoReschedule
-#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES
+#if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
EXTERN _port_set_region
#endif
#if CH_DBG_STATISTICS
@@ -110,7 +110,7 @@ _port_switch: */
PUBLIC _port_thread_start
_port_thread_start:
-#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES
+#if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
bl _port_set_region
#endif
#if CH_DBG_SYSTEM_STATE_CHECK
|