rename __indirection as e__system__nind

6 files changed, 167 insertions, 167 deletions

diff --git a/armap.s b/armap.s
index f46ac0b..e5adb82 100644
--- a/armap.s
+++ b/armap.s
@@ -2033,7 +2033,7 @@ build_node_gc:
 	.globl	apupd_30

 	.globl	apupd_31

 	.globl	apupd_32

-	.globl	__indirection

+	.globl	e__system__nind

 

 apupd_1:

 	ldr	r12,[sp]

@@ -2045,9 +2045,9 @@ apupd_1:
 

 	ldr	r8,[r9,#-4]

 	ldr	r4,[r9,#-8]

-	lao	r12,__indirection,23

+	lao	r12,e__system__nind,23

 	subs	r9,r9,#4

-	otoa	r12,__indirection,23

+	otoa	r12,e__system__nind,23

 	str	r12,[r8]

 	str	r4,[r8,#4]

 ap_1:

@@ -2067,9 +2067,9 @@ apupd_2:
 	ldr	r4,[r9,#-12]

 	ldr	r3,[r9,#-4]

 	str	r3,[r9,#-8]

-	lao	r12,__indirection,24

+	lao	r12,e__system__nind,24

 	subs	r9,r9,#4

-	otoa	r12,__indirection,24

+	otoa	r12,e__system__nind,24

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_2

@@ -2088,9 +2088,9 @@ apupd_3:
 	str	r3,[r9,#-12]

 	ldr	r3,[r9,#-4]

 	str	r3,[r9,#-8]

-	lao	r12,__indirection,25

+	lao	r12,e__system__nind,25

 	subs	r9,r9,#4

-	otoa	r12,__indirection,25

+	otoa	r12,e__system__nind,25

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_3

@@ -2111,9 +2111,9 @@ apupd_4:
 	str	r3,[r9,#-12]

 	ldr	r3,[r9,#-4]

 	str	r3,[r9,#-8]

-	lao	r12,__indirection,26

+	lao	r12,e__system__nind,26

 	subs	r9,r9,#4

-	otoa	r12,__indirection,26

+	otoa	r12,e__system__nind,26

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_4

@@ -2136,9 +2136,9 @@ apupd_5:
 	str	r3,[r9,#-12]

 	ldr	r3,[r9,#-4]

 	str	r3,[r9,#-8]

-	lao	r12,__indirection,27

+	lao	r12,e__system__nind,27

 	subs	r9,r9,#4

-	otoa	r12,__indirection,27

+	otoa	r12,e__system__nind,27

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_5

@@ -2163,9 +2163,9 @@ apupd_6:
 	str	r3,[r9,#-12]

 	ldr	r3,[r9,#-4]

 	str	r3,[r9,#-8]

-	lao	r12,__indirection,28

+	lao	r12,e__system__nind,28

 	subs	r9,r9,#4

-	otoa	r12,__indirection,28

+	otoa	r12,e__system__nind,28

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_6

@@ -2182,9 +2182,9 @@ apupd_7:
 	ldr	r4,[r9,#-32]

 	str	pc,[sp,#-4]!

 	bl	move_8

-	lao	r12,__indirection,29

+	lao	r12,e__system__nind,29

 	subs	r9,r9,#4

-	otoa	r12,__indirection,29

+	otoa	r12,e__system__nind,29

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_7

@@ -2201,9 +2201,9 @@ apupd_8:
 	ldr	r4,[r9,#-36]

 	str	pc,[sp,#-4]!

 	bl	move_9

-	lao	r12,__indirection,30

+	lao	r12,e__system__nind,30

 	subs	r9,r9,#4

-	otoa	r12,__indirection,30

+	otoa	r12,e__system__nind,30

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_8

@@ -2220,9 +2220,9 @@ apupd_9:
 	ldr	r4,[r9,#-40]

 	str	pc,[sp,#-4]!

 	bl	move_10

-	lao	r12,__indirection,31

+	lao	r12,e__system__nind,31

 	subs	r9,r9,#4

-	otoa	r12,__indirection,31

+	otoa	r12,e__system__nind,31

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_9

@@ -2239,9 +2239,9 @@ apupd_10:
 	ldr	r4,[r9,#-44]

 	str	pc,[sp,#-4]!

 	bl	move_11

-	lao	r12,__indirection,32

+	lao	r12,e__system__nind,32

 	subs	r9,r9,#4

-	otoa	r12,__indirection,32

+	otoa	r12,e__system__nind,32

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_10

@@ -2258,9 +2258,9 @@ apupd_11:
 	ldr	r4,[r9,#-48]

 	str	pc,[sp,#-4]!

 	bl	move_12

-	lao	r12,__indirection,33

+	lao	r12,e__system__nind,33

 	subs	r9,r9,#4

-	otoa	r12,__indirection,33

+	otoa	r12,e__system__nind,33

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_11

@@ -2277,9 +2277,9 @@ apupd_12:
 	ldr	r4,[r9,#-52]

 	str	pc,[sp,#-4]!

 	bl	move_13

-	lao	r12,__indirection,34

+	lao	r12,e__system__nind,34

 	subs	r9,r9,#4

-	otoa	r12,__indirection,34

+	otoa	r12,e__system__nind,34

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_12

@@ -2296,9 +2296,9 @@ apupd_13:
 	ldr	r4,[r9,#-56]

 	str	pc,[sp,#-4]!

 	bl	move_14

-	lao	r12,__indirection,35

+	lao	r12,e__system__nind,35

 	subs	r9,r9,#4

-	otoa	r12,__indirection,35

+	otoa	r12,e__system__nind,35

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_13

@@ -2315,9 +2315,9 @@ apupd_14:
 	ldr	r4,[r9,#-60]

 	str	pc,[sp,#-4]!

 	bl	move_15

-	lao	r12,__indirection,36

+	lao	r12,e__system__nind,36

 	subs	r9,r9,#4

-	otoa	r12,__indirection,36

+	otoa	r12,e__system__nind,36

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_14

@@ -2334,9 +2334,9 @@ apupd_15:
 	ldr	r4,[r9,#-64]

 	str	pc,[sp,#-4]!

 	bl	move_16

-	lao	r12,__indirection,37

+	lao	r12,e__system__nind,37

 	subs	r9,r9,#4

-	otoa	r12,__indirection,37

+	otoa	r12,e__system__nind,37

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_15

@@ -2353,9 +2353,9 @@ apupd_16:
 	ldr	r4,[r9,#-68]

 	str	pc,[sp,#-4]!

 	bl	move_17

-	lao	r12,__indirection,38

+	lao	r12,e__system__nind,38

 	subs	r9,r9,#4

-	otoa	r12,__indirection,38

+	otoa	r12,e__system__nind,38

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_16

@@ -2372,9 +2372,9 @@ apupd_17:
 	ldr	r4,[r9,#-72]

 	str	pc,[sp,#-4]!

 	bl	move_18

-	lao	r12,__indirection,39

+	lao	r12,e__system__nind,39

 	subs	r9,r9,#4

-	otoa	r12,__indirection,39

+	otoa	r12,e__system__nind,39

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_17

@@ -2391,9 +2391,9 @@ apupd_18:
 	ldr	r4,[r9,#-76]

 	str	pc,[sp,#-4]!

 	bl	move_19

-	lao	r12,__indirection,40

+	lao	r12,e__system__nind,40

 	subs	r9,r9,#4

-	otoa	r12,__indirection,40

+	otoa	r12,e__system__nind,40

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_18

@@ -2410,9 +2410,9 @@ apupd_19:
 	ldr	r4,[r9,#-80]

 	str	pc,[sp,#-4]!

 	bl	move_20

-	lao	r12,__indirection,41

+	lao	r12,e__system__nind,41

 	subs	r9,r9,#4

-	otoa	r12,__indirection,41

+	otoa	r12,e__system__nind,41

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_19

@@ -2429,9 +2429,9 @@ apupd_20:
 	ldr	r4,[r9,#-84]

 	str	pc,[sp,#-4]!

 	bl	move_21

-	lao	r12,__indirection,42

+	lao	r12,e__system__nind,42

 	subs	r9,r9,#4

-	otoa	r12,__indirection,42

+	otoa	r12,e__system__nind,42

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_20

@@ -2448,9 +2448,9 @@ apupd_21:
 	ldr	r4,[r9,#-88]

 	str	pc,[sp,#-4]!

 	bl	move_22

-	lao	r12,__indirection,43

+	lao	r12,e__system__nind,43

 	subs	r9,r9,#4

-	otoa	r12,__indirection,43

+	otoa	r12,e__system__nind,43

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_21

@@ -2467,9 +2467,9 @@ apupd_22:
 	ldr	r4,[r9,#-92]

 	str	pc,[sp,#-4]!

 	bl	move_23

-	lao	r12,__indirection,44

+	lao	r12,e__system__nind,44

 	subs	r9,r9,#4

-	otoa	r12,__indirection,44

+	otoa	r12,e__system__nind,44

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_22

@@ -2486,9 +2486,9 @@ apupd_23:
 	ldr	r4,[r9,#-96]

 	str	pc,[sp,#-4]!

 	bl	move_24

-	lao	r12,__indirection,45

+	lao	r12,e__system__nind,45

 	subs	r9,r9,#4

-	otoa	r12,__indirection,45

+	otoa	r12,e__system__nind,45

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_23

@@ -2505,9 +2505,9 @@ apupd_24:
 	ldr	r4,[r9,#-100]

 	str	pc,[sp,#-4]!

 	bl	move_25

-	lao	r12,__indirection,46

+	lao	r12,e__system__nind,46

 	subs	r9,r9,#4

-	otoa	r12,__indirection,46

+	otoa	r12,e__system__nind,46

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_24

@@ -2524,9 +2524,9 @@ apupd_25:
 	ldr	r4,[r9,#-104]

 	str	pc,[sp,#-4]!

 	bl	move_26

-	lao	r12,__indirection,47

+	lao	r12,e__system__nind,47

 	subs	r9,r9,#4

-	otoa	r12,__indirection,47

+	otoa	r12,e__system__nind,47

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_25

@@ -2543,9 +2543,9 @@ apupd_26:
 	ldr	r4,[r9,#-108]

 	str	pc,[sp,#-4]!

 	bl	move_27

-	lao	r12,__indirection,48

+	lao	r12,e__system__nind,48

 	subs	r9,r9,#4

-	otoa	r12,__indirection,48

+	otoa	r12,e__system__nind,48

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_26

@@ -2562,9 +2562,9 @@ apupd_27:
 	ldr	r4,[r9,#-112]

 	str	pc,[sp,#-4]!

 	bl	move_28

-	lao	r12,__indirection,49

+	lao	r12,e__system__nind,49

 	subs	r9,r9,#4

-	otoa	r12,__indirection,49

+	otoa	r12,e__system__nind,49

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_27

@@ -2581,9 +2581,9 @@ apupd_28:
 	ldr	r4,[r9,#-116]

 	str	pc,[sp,#-4]!

 	bl	move_29

-	lao	r12,__indirection,50

+	lao	r12,e__system__nind,50

 	subs	r9,r9,#4

-	otoa	r12,__indirection,50

+	otoa	r12,e__system__nind,50

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_28

@@ -2600,9 +2600,9 @@ apupd_29:
 	ldr	r4,[r9,#-120]

 	str	pc,[sp,#-4]!

 	bl	move_30

-	lao	r12,__indirection,51

+	lao	r12,e__system__nind,51

 	subs	r9,r9,#4

-	otoa	r12,__indirection,51

+	otoa	r12,e__system__nind,51

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_29

@@ -2619,9 +2619,9 @@ apupd_30:
 	ldr	r4,[r9,#-124]

 	str	pc,[sp,#-4]!

 	bl	move_31

-	lao	r12,__indirection,52

+	lao	r12,e__system__nind,52

 	subs	r9,r9,#4

-	otoa	r12,__indirection,52

+	otoa	r12,e__system__nind,52

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_30

@@ -2638,9 +2638,9 @@ apupd_31:
 	ldr	r4,[r9,#-128]

 	str	pc,[sp,#-4]!

 	bl	move_32

-	lao	r12,__indirection,53

+	lao	r12,e__system__nind,53

 	subs	r9,r9,#4

-	otoa	r12,__indirection,53

+	otoa	r12,e__system__nind,53

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_31

@@ -2657,9 +2657,9 @@ apupd_32:
 	ldr	r4,[r9,#-132]

 	str	pc,[sp,#-4]!

 	bl	move_33

-	lao	r12,__indirection,54

+	lao	r12,e__system__nind,54

 	subs	r9,r9,#4

-	otoa	r12,__indirection,54

+	otoa	r12,e__system__nind,54

 	str	r12,[r8]

 	str	r4,[r8,#4]

 	b	ap_32

@@ -2808,98 +2808,98 @@ move_7:
 .ifdef PIC

 	lto	apupd_upd,0

 	lto	ap_1,0

-	lto	__indirection,23

+	lto	e__system__nind,23

 	lto	apupd_upd,1

 	lto	ap_2,0

-	lto	__indirection,24

+	lto	e__system__nind,24

 	lto	apupd_upd,2

 	lto	ap_3,0

-	lto	__indirection,25

+	lto	e__system__nind,25

 	lto	apupd_upd,3

 	lto	ap_4,0

-	lto	__indirection,26

+	lto	e__system__nind,26

 	lto	apupd_upd,4

 	lto	ap_5,0

-	lto	__indirection,27

+	lto	e__system__nind,27

 	lto	apupd_upd,5

 	lto	ap_6,0

-	lto	__indirection,28

+	lto	e__system__nind,28

 	lto	apupd_upd,6

 	lto	ap_7,0

-	lto	__indirection,29

+	lto	e__system__nind,29

 	lto	apupd_upd,7

 	lto	ap_8,0

-	lto	__indirection,30

+	lto	e__system__nind,30

 	lto	apupd_upd,8

 	lto	ap_9,0

-	lto	__indirection,31

+	lto	e__system__nind,31

 	lto	apupd_upd,9

 	lto	ap_10,0

-	lto	__indirection,32

+	lto	e__system__nind,32

 	lto	apupd_upd,10

 	lto	ap_11,0

-	lto	__indirection,33

+	lto	e__system__nind,33

 	lto	apupd_upd,11

 	lto	ap_12,0

-	lto	__indirection,34

+	lto	e__system__nind,34

 	lto	apupd_upd,12

 	lto	ap_13,0

-	lto	__indirection,35

+	lto	e__system__nind,35

 	lto	apupd_upd,13

 	lto	ap_14,0

-	lto	__indirection,36

+	lto	e__system__nind,36

 	lto	apupd_upd,14

 	lto	ap_15,0

-	lto	__indirection,37

+	lto	e__system__nind,37

 	lto	apupd_upd,15

 	lto	ap_16,0

-	lto	__indirection,38

+	lto	e__system__nind,38

 	lto	apupd_upd,16

 	lto	ap_17,0

-	lto	__indirection,39

+	lto	e__system__nind,39

 	lto	apupd_upd,17

 	lto	ap_18,0

-	lto	__indirection,40

+	lto	e__system__nind,40

 	lto	apupd_upd,18

 	lto	ap_19,0

-	lto	__indirection,41

+	lto	e__system__nind,41

 	lto	apupd_upd,19

 	lto	ap_20,0

-	lto	__indirection,42

+	lto	e__system__nind,42

 	lto	apupd_upd,20

 	lto	ap_21,0

-	lto	__indirection,43

+	lto	e__system__nind,43

 	lto	apupd_upd,21

 	lto	ap_22,0

-	lto	__indirection,44

+	lto	e__system__nind,44

 	lto	apupd_upd,22

 	lto	ap_23,0

-	lto	__indirection,45

+	lto	e__system__nind,45

 	lto	apupd_upd,23

 	lto	ap_24,0

-	lto	__indirection,46

+	lto	e__system__nind,46

 	lto	apupd_upd,24

 	lto	ap_25,0

-	lto	__indirection,47

+	lto	e__system__nind,47

 	lto	apupd_upd,25

 	lto	ap_26,0

-	lto	__indirection,48

+	lto	e__system__nind,48

 	lto	apupd_upd,26

 	lto	ap_27,0

-	lto	__indirection,49

+	lto	e__system__nind,49

 	lto	apupd_upd,27

 	lto	ap_28,0

-	lto	__indirection,50

+	lto	e__system__nind,50

 	lto	apupd_upd,28

 	lto	ap_29,0

-	lto	__indirection,51

+	lto	e__system__nind,51

 	lto	apupd_upd,29

 	lto	ap_30,0

-	lto	__indirection,52

+	lto	e__system__nind,52

 	lto	apupd_upd,30

 	lto	ap_31,0

-	lto	__indirection,53

+	lto	e__system__nind,53

 	lto	apupd_upd,31

 	lto	ap_32,0

-	lto	__indirection,54

+	lto	e__system__nind,54

 .endif

diff --git a/armcompact_rmark.s b/armcompact_rmark.s
index 251d503..bc0203c 100644
--- a/armcompact_rmark.s
+++ b/armcompact_rmark.s
@@ -459,8 +459,8 @@ rmark_large_tuple_or_record:
 	ldr	r6,[r7,r6]

 	ldr	r7,[sp],#4

 	str	r6,[r9]

-	lao	r12,__indirection,17

-	otoa	r12,__indirection,17

+	lao	r12,e__system__nind,17

+	otoa	r12,e__system__nind,17

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmark_node_d1

@@ -469,8 +469,8 @@ rmark_tuple_selector_node_2:
 	ldr	r6,[r7]

 	ldr	r7,[sp],#4

 	str	r6,[r9]

-	lao	r12,__indirection,18

-	otoa	r12,__indirection,18

+	lao	r12,e__system__nind,18

+	otoa	r12,e__system__nind,18

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmark_node_d1

@@ -543,8 +543,8 @@ rmark_tuple_or_record_selector_node_2:
 	ldr	r6,[r7,r4]

 	ldr	r7,[sp],#4

 	str	r6,[r9]

-	lao	r12,__indirection,19

-	otoa	r12,__indirection,19

+	lao	r12,e__system__nind,19

+	otoa	r12,e__system__nind,19

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmark_node_d1

@@ -997,9 +997,9 @@ rmark_array_length_0_1:
 .ifdef PIC

 	lto	end_vector,16

 	lto	end_vector,17

-	lto	__indirection,17

-	lto	__indirection,18

-	lto	__indirection,19

+	lto	e__system__nind,17

+	lto	e__system__nind,18

+	lto	e__system__nind,19

 	ltol	INT+2,INT_o_2,11

 	ltol	CHAR+2,CHAR_o_2,6

 	lto	small_integers,3

diff --git a/armcompact_rmarkr.s b/armcompact_rmarkr.s
index 05e9959..9c8e6db 100644
--- a/armcompact_rmarkr.s
+++ b/armcompact_rmarkr.s
@@ -378,8 +378,8 @@ rmarkr_large_tuple_or_record:
 	add	r12,r4,#-12

 	ldr	r6,[r7,r12]

 	ldr	r7,[sp],#4

-	lao	r12,__indirection,20

-	otoa	r12,__indirection,20

+	lao	r12,e__system__nind,20

+	otoa	r12,e__system__nind,20

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmarkr_node

@@ -387,8 +387,8 @@ rmarkr_large_tuple_or_record:
 rmarkr_tuple_selector_node_2:

 	ldr	r6,[r7]

 	ldr	r7,[sp],#4

-	lao	r12,__indirection,21

-	otoa	r12,__indirection,21

+	lao	r12,e__system__nind,21

+	otoa	r12,e__system__nind,21

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmarkr_node

@@ -461,8 +461,8 @@ rmarkr_small_tuple_or_record:
 rmarkr_tuple_or_record_selector_node_2:

 	ldr	r6,[r7,r4]

 	ldr	r7,[sp],#4

-	lao	r12,__indirection,22

-	otoa	r12,__indirection,22

+	lao	r12,e__system__nind,22

+	otoa	r12,e__system__nind,22

 	str	r12,[r7,#-4]

 	str	r6,[r7]

 	b	rmarkr_node

@@ -1032,9 +1032,9 @@ rmarkr_next_stack_node:
 

 .ifdef PIC

 	ltol	__ARRAY__+2,__ARRAY___o_2,18

-	lto	__indirection,20

-	lto	__indirection,21

-	lto	__indirection,22

+	lto	e__system__nind,20

+	lto	e__system__nind,21

+	lto	e__system__nind,22

 	ltol	INT+2,INT_o_2,12

 	ltol	CHAR+2,CHAR_o_2,7

 	lto	small_integers,4

diff --git a/armcopy.s b/armcopy.s
index 39fe41f..d96348c 100644
--- a/armcopy.s
+++ b/armcopy.s
@@ -719,13 +719,13 @@ copy_selector_2:
 	add	r11,r6,#-8+4

 .endif

 	ldr	r6,[r6,#-8]

-	lao	r12,__indirection,8

+	lao	r12,e__system__nind,8

 .ifdef PIC

 	ldrh	r6,[r11,r6]

 .else

 	ldrh	r6,[r6,#4]

 .endif

-	otoa	r12,__indirection,8

+	otoa	r12,e__system__nind,8

 	str	r12,[r7]

 

 	cmp	r6,#8

@@ -760,13 +760,13 @@ copy_selector_2_:
 	ldr	r6,[r6,#-8]

 	ldr	r3,[sp],#4

 

-	lao	r12,__indirection,9

+	lao	r12,e__system__nind,9

 .ifdef PIC

 	ldrh	r6,[r11,r6]

 .else

 	ldrh	r6,[r6,#4]

 .endif

-	otoa	r12,__indirection,9

+	otoa	r12,e__system__nind,9

 	str	r12,[r7]

 

 	ldr	r6,[r4,r6]

@@ -834,9 +834,9 @@ copy_record_selector_2_:
 	add	r11,r6,#-8+4

 .endif

 	ldr	r4,[r6,#-8]

-	lao	r12,__indirection,10

+	lao	r12,e__system__nind,10

 	ldr	r6,[r7,#4]

-	otoa	r12,__indirection,10

+	otoa	r12,e__system__nind,10

 	str	r12,[r7]

 

 .ifdef PIC

@@ -1309,11 +1309,11 @@ copy_array_21_lp_ab_next:
 	lto	heap_copied_vector,4

 	lto	heap_p1,10

 	lto	heap_copied_vector,5

-	lto	__indirection,8

-	lto	__indirection,9

+	lto	e__system__nind,8

+	lto	e__system__nind,9

 	lto	heap_p1,11

 	lto	heap_copied_vector,6

-	lto	__indirection,10

+	lto	e__system__nind,10

 	lto	heap_p1,12

 	lto	heap_copied_vector,7

  .ifdef DLL

diff --git a/armmark.s b/armmark.s
index f501b61..33ab030 100644
--- a/armmark.s
+++ b/armmark.s
@@ -708,12 +708,12 @@ _large_tuple_or_record:
 	tst	r8,r12

 	bne	_mark_node3

 

-	lao	r8,__indirection,11

+	lao	r8,e__system__nind,11

 .ifdef PIC

 	add	r12,r4,#-8+4

 .endif

 	ldr	r4,[r4,#-8]

-	otoa	r8,__indirection,11

+	otoa	r8,e__system__nind,11

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -737,12 +737,12 @@ _mark_tuple_selector_node_2:
 	b	_mark_node

 

 _small_tuple_or_record:

-	lao	r8,__indirection,12

+	lao	r8,e__system__nind,12

 .ifdef PIC

 	add	r12,r4,#-8+4

 .endif

 	ldr	r4,[r4,#-8]

-	otoa	r8,__indirection,12

+	otoa	r8,e__system__nind,12

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -784,12 +784,12 @@ _mark_record_selector_node_1:
 	tst	r8,r12

 	bne	_mark_node3

 

-	lao	r8,__indirection,13

+	lao	r8,e__system__nind,13

 .ifdef PIC

 	add	r12,r4,#-8+4

 .endif

 	ldr	r4,[r4,#-8]

-	otoa	r8,__indirection,13

+	otoa	r8,e__system__nind,13

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -1435,9 +1435,9 @@ __end_mark_using_reversal:
 

 .ifdef PIC

 	lto	end_vector,2

-	lto	__indirection,11

-	lto	__indirection,12

-	lto	__indirection,13

+	lto	e__system__nind,11

+	lto	e__system__nind,12

+	lto	e__system__nind,13

 	lto	end_vector,3

 	ltol	INT+2,INT_o_2,7

 	ltol	CHAR+2,CHAR_o_2,3

@@ -1639,9 +1639,9 @@ __large_tuple_or_record:
 .else

 	ldr	r4,[r4,#-8]

 .endif

-	lao	r8,__indirection,14

+	lao	r8,e__system__nind,14

 	ldr	r7,[r6]

-	otoa	r8,__indirection,14

+	otoa	r8,e__system__nind,14

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -1673,9 +1673,9 @@ __small_tuple_or_record:
 .else

 	ldr	r4,[r4,#-8]

 .endif

-	lao	r8,__indirection,15

+	lao	r8,e__system__nind,15

 	ldr	r7,[r6]

-	otoa	r8,__indirection,15

+	otoa	r8,e__system__nind,15

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -1734,9 +1734,9 @@ __small_record:
 .else

 	ldr	r4,[r4,#-8]

 .endif

-	lao	r8,__indirection,16

+	lao	r8,e__system__nind,16

 	ldr	r7,[r6]

-	otoa	r8,__indirection,16

+	otoa	r8,e__system__nind,16

 	str	r8,[r6,#-4]

 	mov	r8,r6

 

@@ -2438,9 +2438,9 @@ __last__string__bits:
 	b	__mark_next_node

 

 .ifdef PIC

-	lto	__indirection,14

-	lto	__indirection,15

-	lto	__indirection,16

+	lto	e__system__nind,14

+	lto	e__system__nind,15

+	lto	e__system__nind,16

 	lto	small_integers,2

 	lto	static_characters,2

 	lto	lazy_array_list,2

diff --git a/armstartup.s b/armstartup.s
index d5e284d..1baa10d 100644
--- a/armstartup.s
+++ b/armstartup.s
@@ -329,7 +329,7 @@ start_address:
 	.globl	e__system__nind
 	.globl	e__system__eaind
 @ old names of the previous two labels for compatibility, remove later
-	.globl	__indirection,__eaind
+	.globl	e__system__nind,__eaind
 	.globl	e__system__dind
 	.globl	eval_fill
 
@@ -3085,8 +3085,8 @@ eval_fill2:
 	mov	r8,r4
 .endif
 eval_upd_0:
-	lao	r12,__indirection,0
-	otoa	r12,__indirection,0
+	lao	r12,e__system__nind,0
+	otoa	r12,e__system__nind,0
 	str	r12,[r7]
 	str	r6,[r7,#4]
 	mov	pc,r11
@@ -3097,8 +3097,8 @@ eval_upd_0:
 	mov	r8,r4
 .endif
 eval_upd_1:
-	lao	r12,__indirection,1
-	otoa	r12,__indirection,1
+	lao	r12,e__system__nind,1
+	otoa	r12,e__system__nind,1
 	str	r12,[r7]
 	ldr	r4,[r7,#4]
 	str	r6,[r7,#4]
@@ -3111,8 +3111,8 @@ eval_upd_1:
 	mov	r8,r4
 .endif
 eval_upd_2:
-	lao	r12,__indirection,2
-	otoa	r12,__indirection,2
+	lao	r12,e__system__nind,2
+	otoa	r12,e__system__nind,2
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
 	str	r6,[r7,#4]
@@ -3125,8 +3125,8 @@ eval_upd_2:
 	mov	r8,r4
 .endif
 eval_upd_3:
-	lao	r12,__indirection,3
-	otoa	r12,__indirection,3
+	lao	r12,e__system__nind,3
+	otoa	r12,e__system__nind,3
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
 	str	r6,[r7,#4]
@@ -3141,8 +3141,8 @@ eval_upd_3:
 	mov	r8,r4
 .endif
 eval_upd_4:
-	lao	r12,__indirection,4
-	otoa	r12,__indirection,4
+	lao	r12,e__system__nind,4
+	otoa	r12,e__system__nind,4
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
 	str	r6,[r7,#4]
@@ -3160,8 +3160,8 @@ eval_upd_4:
 	mov	r8,r4
 .endif
 eval_upd_5:
-	lao	r12,__indirection,5
-	otoa	r12,__indirection,5
+	lao	r12,e__system__nind,5
+	otoa	r12,e__system__nind,5
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
 	str	r6,[r9]
@@ -3181,8 +3181,8 @@ eval_upd_5:
 	mov	r8,r4
 .endif
 eval_upd_6:
-	lao	r12,__indirection,6
-	otoa	r12,__indirection,6
+	lao	r12,e__system__nind,6
+	otoa	r12,e__system__nind,6
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
 	str	r6,[r9]
@@ -3207,8 +3207,8 @@ eval_upd_7:
 	mov	r4,#0
 	mov	r3,#20
 eval_upd_n:
-	lao	r12,__indirection,7
-	otoa	r12,__indirection,7
+	lao	r12,e__system__nind,7
+	otoa	r12,e__system__nind,7
 	add	r2,r7,r3
 	str	r12,[r7]
 	ldr	r8,[r7,#4]
@@ -4821,14 +4821,14 @@ r_to_i_real:
  	lto	flags,14
   .endif
  .endif
-	lto	__indirection,0
-	lto	__indirection,1
-	lto	__indirection,2
-	lto	__indirection,3
-	lto	__indirection,4
-	lto	__indirection,5
-	lto	__indirection,6
-	lto	__indirection,7
+	lto	e__system__nind,0
+	lto	e__system__nind,1
+	lto	e__system__nind,2
+	lto	e__system__nind,3
+	lto	e__system__nind,4
+	lto	e__system__nind,5
+	lto	e__system__nind,6
+	lto	e__system__nind,7
 	ltol	__STRING__+2,__STRING___o_2,5
 	ltol	__STRING__+2,__STRING___o_2,6
 	ltol	__ARRAY__+2,__ARRAY___o_2,2