diff --git a/mach/powerpc/as/mach2.c b/mach/powerpc/as/mach2.c
index d1a959fc3..7cd4a4ff4 100644
--- a/mach/powerpc/as/mach2.c
+++ b/mach/powerpc/as/mach2.c
@@ -80,7 +80,7 @@
 %token <y_word> OP_TO_RA_RB
 %token <y_word> OP_TO_RA_SI
 
-%token <y_word> OP_LA
+%token <y_word> OP_LI32
 
 /* Other token types */
 
diff --git a/mach/powerpc/as/mach3.c b/mach/powerpc/as/mach3.c
index 278a7e607..153e5d4d2 100644
--- a/mach/powerpc/as/mach3.c
+++ b/mach/powerpc/as/mach3.c
@@ -98,7 +98,7 @@
 
 /* Special instructions */
 
-0,     OP_LA,                 0,                                       "la",
+0,     OP_LI32,               0,                                       "li32",
 
 /* Branch processor instructions (page 20) */
 
diff --git a/mach/powerpc/as/mach4.c b/mach/powerpc/as/mach4.c
index acb4abf1b..2fe584992 100644
--- a/mach/powerpc/as/mach4.c
+++ b/mach/powerpc/as/mach4.c
@@ -58,7 +58,7 @@ operation
 	| OP_LEV               u7                         { emit4($1 | ($2<<5)); }
 	| OP_LIA               lia                        { emit4($1 | $2); }
 	| OP_LIL               lil                        { emit4($1 | $2); }
-	| OP_LA                la                         /* emitted in subrule */
+	| OP_LI32              li32                       /* emitted in subrule */
 	;
 
 c
@@ -193,7 +193,7 @@ bda
 	}
 	;
 	
-la
+li32
 	: GPR ',' expr
 	{
 		newrelo($3.typ, RELOPPC | FIXUPFLAGS);
diff --git a/mach/powerpc/libem/aar4.s b/mach/powerpc/libem/aar4.s
index 6a48aa058..2c65af643 100644
--- a/mach/powerpc/libem/aar4.s
+++ b/mach/powerpc/libem/aar4.s
@@ -20,7 +20,7 @@
 
 .define .aar4
 .aar4:
-	la r0, .trap_earray
+	li32 r0, .trap_earray
 	mtspr ctr, r0            ! load CTR with trap address
 
 	lwz r0, 0(r3)
diff --git a/mach/powerpc/libem/cfu8.s b/mach/powerpc/libem/cfu8.s
index 2e082c252..758df8572 100644
--- a/mach/powerpc/libem/cfu8.s
+++ b/mach/powerpc/libem/cfu8.s
@@ -13,15 +13,15 @@
 
 .define .cfu8
 .cfu8:
-	la r3, .fd_00000000
+	li32 r3, .fd_00000000
 	lfd f0, 0(r3)            ! f0 = 0.0
 	
 	lfd f1, 0(sp)            ! value to be converted
 
-	la r3, .fd_FFFFFFFF
+	li32 r3, .fd_FFFFFFFF
 	lfd f3, 0(r3)            ! f3 = 0xFFFFFFFF	
 
-	la r3, .fd_80000000
+	li32 r3, .fd_80000000
 	lfd f4, 0(r3)            ! f4 = 0x80000000 	
 	
 	fsel f2, f1, f1, f0
diff --git a/mach/powerpc/libem/cif8.s b/mach/powerpc/libem/cif8.s
index 2e7b48d17..d2c82e54e 100644
--- a/mach/powerpc/libem/cif8.s
+++ b/mach/powerpc/libem/cif8.s
@@ -24,7 +24,7 @@
 	
 	lfd f0, 0(sp)            ! load value
 
-	la r3, pivot
+	li32 r3, pivot
 	lfd f1, 0(r3)            ! load pivot value
 	fsub f0, f0, f1          ! adjust
 	                         
diff --git a/mach/powerpc/libem/cuf8.s b/mach/powerpc/libem/cuf8.s
index ea5ec263a..5d5a12988 100644
--- a/mach/powerpc/libem/cuf8.s
+++ b/mach/powerpc/libem/cuf8.s
@@ -20,7 +20,7 @@
 	
 	lfd f0, 0(sp)            ! load value
 	
-	la r3, pivot
+	li32 r3, pivot
 	lfd f1, 0(r3)            ! load pivot value
 	fsub f0, f0, f1          ! adjust
 	                         
diff --git a/mach/powerpc/ncg/table b/mach/powerpc/ncg/table
index 0ad8ef006..60cf93c07 100644
--- a/mach/powerpc/ncg/table
+++ b/mach/powerpc/ncg/table
@@ -293,7 +293,6 @@ INSTRUCTIONS
   fsubs           FSREG:wo, FSREG:ro, FSREG:ro.
   fmr             FPR:wo, FPR:ro.
   fmr             FSREG:wo, FSREG:ro.
-  la              GPRI:wo, LABEL:ro.
   lbzx            GPRI:wo, GPR:ro, GPR:ro.
   lbz             GPRI:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
   lfd             FPR:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
@@ -306,6 +305,7 @@ INSTRUCTIONS
   lhax            GPRI:wo, GPR:ro, GPR:ro.
   lha             GPRI:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
   lhz             GPRI:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
+  li32            GPRI:wo, LABEL:ro.
   lwzu            GPRI:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
   lwzx            GPRI:wo, GPR:ro, GPR:ro.
   lwz             GPRI:wo, GPRINDIRECT+GPRINDIRECTLO:ro.
@@ -385,7 +385,7 @@ MOVES
 	from LABEL to GPR
 		gen
 			COMMENT("move LABEL->GPR")
-			la %2, {LABEL, %1.adr}
+			li32 %2, {LABEL, %1.adr}
 	
 /* Sign extension */
 
diff --git a/plat/linuxppc/libsys/_syscall.s b/plat/linuxppc/libsys/_syscall.s
index ccafe2460..c7e818830 100644
--- a/plat/linuxppc/libsys/_syscall.s
+++ b/plat/linuxppc/libsys/_syscall.s
@@ -42,7 +42,7 @@ __syscall:
 	bc IFTRUE, GT, 2f
 	
 3:
-	la r4, _errno
+	li32 r4, _errno
 	stw r3, 0(r4)
 	addi r3, r0, -1
 	bclr ALWAYS, 0, 0
diff --git a/plat/linuxppc/libsys/trap.s b/plat/linuxppc/libsys/trap.s
index af36acf2d..09d3b0b21 100644
--- a/plat/linuxppc/libsys/trap.s
+++ b/plat/linuxppc/libsys/trap.s
@@ -65,13 +65,13 @@ EUNIMPL = 63		! unimplemented em-instruction called
 	
 	addi r4, r0, 1
 	rlwnm r4, r4, r3, 0, 31  ! calculate trap bit
-	la r5, .ignmask
+	li32 r5, .ignmask
 	lwz r5, 0(r5)            ! load ignore mask
 	and. r4, r4, r5          ! compare
 	bclr IFFALSE, EQ, 0      ! return if non-zero
 	
 1:
-	la r4, .trppc
+	li32 r4, .trppc
 	lwz r5, 0(r4)            ! load user trap routine
 	or. r5, r5, r5           ! test
 	bc IFTRUE, EQ, fatal     ! if no user trap routine, bail out
@@ -92,7 +92,7 @@ EUNIMPL = 63		! unimplemented em-instruction called
 
 fatal:
 	addi r3, r0, 1
-	la r4, message
+	li32 r4, message
 	addi r5, r0, 6
 	addi r0, r0, 4           ! write()
 	sc 0