|
| 1 | +diff --git a/Zend/asm/jump_arm_aapcs_elf_gas.S b/Zend/asm/jump_arm_aapcs_elf_gas.S |
| 2 | +index 4415a541fd3..647ae9f45ad 100644 |
| 3 | +--- a/Zend/asm/jump_arm_aapcs_elf_gas.S |
| 4 | ++++ b/Zend/asm/jump_arm_aapcs_elf_gas.S |
| 5 | +@@ -50,7 +50,7 @@ jump_fcontext: |
| 6 | + push {lr} |
| 7 | + @ save hidden,V1-V8,LR |
| 8 | + |
| 9 | +- #if __ARM_ARCH >= 7 |
| 10 | ++ #if !defined(__ARM_ARCH_6M__) |
| 11 | + |
| 12 | + push {a1,v1-v8,lr} |
| 13 | + |
| 14 | +@@ -102,7 +102,7 @@ jump_fcontext: |
| 15 | + add sp, sp, #64 |
| 16 | + |
| 17 | + @ restore hidden,V1-V8,LR |
| 18 | +- #if __ARM_ARCH >= 7 |
| 19 | ++ #if !defined(__ARM_ARCH_6M__) |
| 20 | + pop {a4,v1-v8,lr} |
| 21 | + #else |
| 22 | + |
| 23 | +diff --git a/Zend/asm/make_arm_aapcs_elf_gas.S b/Zend/asm/make_arm_aapcs_elf_gas.S |
| 24 | +index 2367c75a6a7..b5cf0c8fa09 100644 |
| 25 | +--- a/Zend/asm/make_arm_aapcs_elf_gas.S |
| 26 | ++++ b/Zend/asm/make_arm_aapcs_elf_gas.S |
| 27 | +@@ -48,7 +48,7 @@ |
| 28 | + make_fcontext: |
| 29 | + @ shift address in A1 to lower 16 byte boundary |
| 30 | + |
| 31 | +- #if __ARM_ARCH >= 7 |
| 32 | ++ #if !defined(__ARM_ARCH_6M__) |
| 33 | + bic a1, a1, #15 |
| 34 | + #else |
| 35 | + lsrs a1, a1, #4 |
| 36 | +@@ -56,7 +56,7 @@ make_fcontext: |
| 37 | + #endif |
| 38 | + |
| 39 | + @ reserve space for context-data on context-stack |
| 40 | +- #if __ARM_ARCH >= 7 |
| 41 | ++ #if !defined(__ARM_ARCH_6M__) |
| 42 | + sub a1, a1, #124 |
| 43 | + #else |
| 44 | + subs a1, #124 |
| 45 | +@@ -66,7 +66,7 @@ make_fcontext: |
| 46 | + str a3, [a1, #104] |
| 47 | + |
| 48 | + @ compute address of returned transfer_t |
| 49 | +- #if __ARM_ARCH >= 7 |
| 50 | ++ #if !defined(__ARM_ARCH_6M__) |
| 51 | + add a2, a1, #108 |
| 52 | + #else |
| 53 | + mov a2, a1 |
| 54 | +@@ -77,7 +77,7 @@ make_fcontext: |
| 55 | + |
| 56 | + |
| 57 | + @ compute abs address of label finish |
| 58 | +- #if __ARM_ARCH >= 7 |
| 59 | ++ #if !defined(__ARM_ARCH_6M__) |
| 60 | + adr a2, finish |
| 61 | + #else |
| 62 | + ldr a2, =finish |
| 63 | +@@ -93,7 +93,7 @@ make_fcontext: |
| 64 | + |
| 65 | + finish: |
| 66 | + @ exit code is zero |
| 67 | +- #if __ARM_ARCH >=7 |
| 68 | ++ #if !defined(__ARM_ARCH_6M__) |
| 69 | + mov a1, #0 |
| 70 | + #else |
| 71 | + movs r3, #0 |
0 commit comments