Update.

	* sysdeps/powerpc/gprrest0.S: Use ASM_GLOBAL_DIRECTIVE instead of
	.globl.
	* sysdeps/powerpc/gprsave0.S: Likewise.
	* sysdeps/powerpc/gprrest1.S: Likewise.
	* sysdeps/powerpc/gprsave1.S: Likewise.

5 files changed, 77 insertions, 77 deletions

diff --git a/sysdeps/powerpc/gprrest0.S b/sysdeps/powerpc/gprrest0.S
index f944c41397..3e6b327ffb 100644
--- a/sysdeps/powerpc/gprrest0.S
+++ b/sysdeps/powerpc/gprrest0.S
@@ -18,42 +18,42 @@
 
 #include <sysdep.h>
 
-		.globl _restgpr0_13
+		ASM_GLOBAL_DIRECTIVE _restgpr0_13
 _restgpr0_13:	lwz	r13,-76(r1)
-		.globl _restgpr0_14
+		ASM_GLOBAL_DIRECTIVE _restgpr0_14
 _restgpr0_14:	lwz	r14,-72(r1)
-		.globl _restgpr0_15
+		ASM_GLOBAL_DIRECTIVE _restgpr0_15
 _restgpr0_15:	lwz	r15,-68(r1)
-		.globl _restgpr0_16
+		ASM_GLOBAL_DIRECTIVE _restgpr0_16
 _restgpr0_16:	lwz	r16,-64(r1)
-		.globl _restgpr0_17
+		ASM_GLOBAL_DIRECTIVE _restgpr0_17
 _restgpr0_17:	lwz	r17,-60(r1)
-		.globl _restgpr0_18
+		ASM_GLOBAL_DIRECTIVE _restgpr0_18
 _restgpr0_18:	lwz	r18,-56(r1)
-		.globl _restgpr0_19
+		ASM_GLOBAL_DIRECTIVE _restgpr0_19
 _restgpr0_19:	lwz	r19,-52(r1)
-		.globl _restgpr0_20
+		ASM_GLOBAL_DIRECTIVE _restgpr0_20
 _restgpr0_20:	lwz	r20,-48(r1)
-		.globl _restgpr0_21
+		ASM_GLOBAL_DIRECTIVE _restgpr0_21
 _restgpr0_21:	lwz	r21,-44(r1)
-		.globl _restgpr0_22
+		ASM_GLOBAL_DIRECTIVE _restgpr0_22
 _restgpr0_22:	lwz	r22,-40(r1)
-		.globl _restgpr0_23
+		ASM_GLOBAL_DIRECTIVE _restgpr0_23
 _restgpr0_23:	lwz	r23,-36(r1)
-		.globl _restgpr0_24
+		ASM_GLOBAL_DIRECTIVE _restgpr0_24
 _restgpr0_24:	lwz	r24,-32(r1)
-		.globl _restgpr0_25
+		ASM_GLOBAL_DIRECTIVE _restgpr0_25
 _restgpr0_25:	lwz	r25,-28(r1)
-		.globl _restgpr0_26
+		ASM_GLOBAL_DIRECTIVE _restgpr0_26
 _restgpr0_26:	lwz	r26,-24(r1)
-		.globl _restgpr0_27
+		ASM_GLOBAL_DIRECTIVE _restgpr0_27
 _restgpr0_27:	lwz	r27,-20(r1)
-		.globl _restgpr0_28
+		ASM_GLOBAL_DIRECTIVE _restgpr0_28
 _restgpr0_28:	lwz	r28,-16(r1)
-		.globl _restgpr0_29
+		ASM_GLOBAL_DIRECTIVE _restgpr0_29
 _restgpr0_29:	lwz	r29,-12(r1)
-		.globl _restgpr0_30
+		ASM_GLOBAL_DIRECTIVE _restgpr0_30
 _restgpr0_30:	lwz	r30,-8(r1)
-		.globl _restgpr0_31
+		ASM_GLOBAL_DIRECTIVE _restgpr0_31
 _restgpr0_31:	lwz	r31,-4(r1)
 		blr
diff --git a/sysdeps/powerpc/gprrest1.S b/sysdeps/powerpc/gprrest1.S
index 2ebb4f4678..d92a8cda6c 100644
--- a/sysdeps/powerpc/gprrest1.S
+++ b/sysdeps/powerpc/gprrest1.S
@@ -18,42 +18,42 @@
 
 #include <sysdep.h>
 
-		.globl	_restgpr1_13
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_13
 _restgpr1_13:	lwz	r13,-76(r12)
-		.globl	_restgpr1_14
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_14
 _restgpr1_14:	lwz	r14,-72(r12)
-		.globl	_restgpr1_15
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_15
 _restgpr1_15:	lwz	r15,-68(r12)
-		.globl	_restgpr1_16
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_16
 _restgpr1_16:	lwz	r16,-64(r12)
-		.globl	_restgpr1_17
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_17
 _restgpr1_17:	lwz	r17,-60(r12)
-		.globl	_restgpr1_18
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_18
 _restgpr1_18:	lwz	r18,-56(r12)
-		.globl	_restgpr1_19
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_19
 _restgpr1_19:	lwz	r19,-52(r12)
-		.globl	_restgpr1_20
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_20
 _restgpr1_20:	lwz	r20,-48(r12)
-		.globl	_restgpr1_21
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_21
 _restgpr1_21:	lwz	r21,-44(r12)
-		.globl	_restgpr1_22
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_22
 _restgpr1_22:	lwz	r22,-40(r12)
-		.globl	_restgpr1_23
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_23
 _restgpr1_23:	lwz	r23,-36(r12)
-		.globl	_restgpr1_24
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_24
 _restgpr1_24:	lwz	r24,-32(r12)
-		.globl	_restgpr1_25
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_25
 _restgpr1_25:	lwz	r25,-28(r12)
-		.globl	_restgpr1_26
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_26
 _restgpr1_26:	lwz	r26,-24(r12)
-		.globl	_restgpr1_27
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_27
 _restgpr1_27:	lwz	r27,-20(r12)
-		.globl	_restgpr1_28
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_28
 _restgpr1_28:	lwz	r28,-16(r12)
-		.globl	_restgpr1_29
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_29
 _restgpr1_29:	lwz	r29,-12(r12)
-		.globl	_restgpr1_30
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_30
 _restgpr1_30:	lwz	r30,-8(r12)
-		.globl	_restgpr1_31
+		ASM_GLOBAL_DIRECTIVE	_restgpr1_31
 _restgpr1_31:	lwz	r31,-4(r12)
 		blr
diff --git a/sysdeps/powerpc/gprsave0.S b/sysdeps/powerpc/gprsave0.S
index 0469199b08..ddd88b56b0 100644
--- a/sysdeps/powerpc/gprsave0.S
+++ b/sysdeps/powerpc/gprsave0.S
@@ -18,43 +18,43 @@
 
 #include <sysdep.h>
 
-		.globl _savegpr0_13
+		ASM_GLOBAL_DIRECTIVE _savegpr0_13
 _savegpr0_13:	stw	r13,-76(r1)
-		.globl _savegpr0_14
+		ASM_GLOBAL_DIRECTIVE _savegpr0_14
 _savegpr0_14:	stw	r14,-72(r1)
-		.globl _savegpr0_15
+		ASM_GLOBAL_DIRECTIVE _savegpr0_15
 _savegpr0_15:	stw	r15,-68(r1)
-		.globl _savegpr0_16
+		ASM_GLOBAL_DIRECTIVE _savegpr0_16
 _savegpr0_16:	stw	r16,-64(r1)
-		.globl _savegpr0_17
+		ASM_GLOBAL_DIRECTIVE _savegpr0_17
 _savegpr0_17:	stw	r17,-60(r1)
-		.globl _savegpr0_18
+		ASM_GLOBAL_DIRECTIVE _savegpr0_18
 _savegpr0_18:	stw	r18,-56(r1)
-		.globl _savegpr0_19
+		ASM_GLOBAL_DIRECTIVE _savegpr0_19
 _savegpr0_19:	stw	r19,-52(r1)
-		.globl _savegpr0_20
+		ASM_GLOBAL_DIRECTIVE _savegpr0_20
 _savegpr0_20:	stw	r20,-48(r1)
-		.globl _savegpr0_21
+		ASM_GLOBAL_DIRECTIVE _savegpr0_21
 _savegpr0_21:	stw	r21,-44(r1)
-		.globl _savegpr0_22
+		ASM_GLOBAL_DIRECTIVE _savegpr0_22
 _savegpr0_22:	stw	r22,-40(r1)
-		.globl _savegpr0_23
+		ASM_GLOBAL_DIRECTIVE _savegpr0_23
 _savegpr0_23:	stw	r23,-36(r1)
-		.globl _savegpr0_24
+		ASM_GLOBAL_DIRECTIVE _savegpr0_24
 _savegpr0_24:	stw	r24,-32(r1)
-		.globl _savegpr0_25
+		ASM_GLOBAL_DIRECTIVE _savegpr0_25
 _savegpr0_25:	stw	r25,-28(r1)
-		.globl _savegpr0_26
+		ASM_GLOBAL_DIRECTIVE _savegpr0_26
 _savegpr0_26:	stw	r26,-24(r1)
-		.globl _savegpr0_27
+		ASM_GLOBAL_DIRECTIVE _savegpr0_27
 _savegpr0_27:	stw	r27,-20(r1)
-		.globl _savegpr0_28
+		ASM_GLOBAL_DIRECTIVE _savegpr0_28
 _savegpr0_28:	stw	r28,-16(r1)
-		.globl _savegpr0_29
+		ASM_GLOBAL_DIRECTIVE _savegpr0_29
 _savegpr0_29:	stw	r29,-12(r1)
-		.globl _savegpr0_30
+		ASM_GLOBAL_DIRECTIVE _savegpr0_30
 _savegpr0_30:	stw	r30,-8(r1)
-		.globl _savegpr0_31
+		ASM_GLOBAL_DIRECTIVE _savegpr0_31
 _savegpr0_31:	stw	r31,-4(r1)
 		stw	r0,8(r1)
 		blr
diff --git a/sysdeps/powerpc/gprsave1.S b/sysdeps/powerpc/gprsave1.S
index deeb537785..85d6bdc7e0 100644
--- a/sysdeps/powerpc/gprsave1.S
+++ b/sysdeps/powerpc/gprsave1.S
@@ -18,42 +18,42 @@
 
 #include <sysdep.h>
 
-		.globl _savegpr1_13
+		ASM_GLOBAL_DIRECTIVE _savegpr1_13
 _savegpr1_13:	stw	r13,-76(r12)
-		.globl _savegpr1_14
+		ASM_GLOBAL_DIRECTIVE _savegpr1_14
 _savegpr1_14:	stw	r14,-72(r12)
-		.globl _savegpr1_15
+		ASM_GLOBAL_DIRECTIVE _savegpr1_15
 _savegpr1_15:	stw	r15,-68(r12)
-		.globl _savegpr1_16
+		ASM_GLOBAL_DIRECTIVE _savegpr1_16
 _savegpr1_16:	stw	r16,-64(r12)
-		.globl _savegpr1_17
+		ASM_GLOBAL_DIRECTIVE _savegpr1_17
 _savegpr1_17:	stw	r17,-60(r12)
-		.globl _savegpr1_18
+		ASM_GLOBAL_DIRECTIVE _savegpr1_18
 _savegpr1_18:	stw	r18,-56(r12)
-		.globl _savegpr1_19
+		ASM_GLOBAL_DIRECTIVE _savegpr1_19
 _savegpr1_19:	stw	r19,-52(r12)
-		.globl _savegpr1_20
+		ASM_GLOBAL_DIRECTIVE _savegpr1_20
 _savegpr1_20:	stw	r20,-48(r12)
-		.globl _savegpr1_21
+		ASM_GLOBAL_DIRECTIVE _savegpr1_21
 _savegpr1_21:	stw	r21,-44(r12)
-		.globl _savegpr1_22
+		ASM_GLOBAL_DIRECTIVE _savegpr1_22
 _savegpr1_22:	stw	r22,-40(r12)
-		.globl _savegpr1_23
+		ASM_GLOBAL_DIRECTIVE _savegpr1_23
 _savegpr1_23:	stw	r23,-36(r12)
-		.globl _savegpr1_24
+		ASM_GLOBAL_DIRECTIVE _savegpr1_24
 _savegpr1_24:	stw	r24,-32(r12)
-		.globl _savegpr1_25
+		ASM_GLOBAL_DIRECTIVE _savegpr1_25
 _savegpr1_25:	stw	r25,-28(r12)
-		.globl _savegpr1_26
+		ASM_GLOBAL_DIRECTIVE _savegpr1_26
 _savegpr1_26:	stw	r26,-24(r12)
-		.globl _savegpr1_27
+		ASM_GLOBAL_DIRECTIVE _savegpr1_27
 _savegpr1_27:	stw	r27,-20(r12)
-		.globl _savegpr1_28
+		ASM_GLOBAL_DIRECTIVE _savegpr1_28
 _savegpr1_28:	stw	r28,-16(r12)
-		.globl _savegpr1_29
+		ASM_GLOBAL_DIRECTIVE _savegpr1_29
 _savegpr1_29:	stw	r29,-12(r12)
-		.globl _savegpr1_30
+		ASM_GLOBAL_DIRECTIVE _savegpr1_30
 _savegpr1_30:	stw	r30,-8(r12)
-		.globl _savegpr1_31
+		ASM_GLOBAL_DIRECTIVE _savegpr1_31
 _savegpr1_31:	stw	r31,-4(r12)
 		blr
diff --git a/sysdeps/powerpc/memset.S b/sysdeps/powerpc/memset.S
index 6dfe25023e..1b95bc7591 100644
--- a/sysdeps/powerpc/memset.S
+++ b/sysdeps/powerpc/memset.S
@@ -63,7 +63,7 @@ L(aligned):
 	bf     28,L(a1)
 	stw    r4,-4(r8)
 	stwu   r4,-8(r8)
-L(a1):	blt    cr1,2f
+L(a1):	blt    cr1,L(a2)
 	stw    r4,-4(r8)	# 32nd instruction from .align
 	stw    r4,-8(r8)
 	stw    r4,-12(r8)