* mpn/x86/x86-defs.m4, mpn/x86/*/*.asm: Remove L / LF scheme putting

	function name in local labels.

34 files changed, 64 insertions, 103 deletions

diff --git a/mpn/x86/aors_n.asm b/mpn/x86/aors_n.asm
index 182d6f7cd..a7a1ed8d1 100644
--- a/mpn/x86/aors_n.asm
+++ b/mpn/x86/aors_n.asm
@@ -76,7 +76,7 @@ deflit(`FRAME',0)
 	shrl	$3,%ecx			C compute count for unrolled loop
 	negl	%eax
 	andl	$7,%eax			C get index where to start loop
-	jz	LF(M4_function_n,oopgo)	C necessary special case for 0
+	jz	L(oopgo)		C necessary special case for 0
 	incl	%ecx			C adjust loop count
 	shll	$2,%eax			C adjustment for pointers...
 	subl	%eax,%edi		C ... since they are offset ...
@@ -90,11 +90,11 @@ ifdef(`PIC',`
 	call	L(0a)
 L(0a):	leal	(%eax,%eax,8),%eax
 	addl	(%esp),%eax
-	addl	$LF(M4_function_n,oop)-L(0a)-3,%eax
+	addl	$L(oop)-L(0a)-3,%eax
 	addl	$4,%esp
 ',`
 	C Calculate start address in loop for non-PIC.
- 	leal	LF(M4_function_n,oop)-3(%eax,%eax,8),%eax
+ 	leal	L(oop)-3(%eax,%eax,8),%eax
 ')
 
 	C These lines initialize carry from the 5th parameter.  Should be
diff --git a/mpn/x86/divrem_1.asm b/mpn/x86/divrem_1.asm
index dae30c941..2389da3de 100644
--- a/mpn/x86/divrem_1.asm
+++ b/mpn/x86/divrem_1.asm
@@ -114,10 +114,10 @@ deflit(`FRAME',0)
 	orl	%ecx, %ecx
 
 	movl	PARAM_CARRY, %edx
-	jz	LF(mpn_divrem_1,fraction)
+	jz	L(fraction)
 
 	leal	-4(%ebx,%ebp,4), %ebx	C dst one limb below integer part
-	jmp	LF(mpn_divrem_1,integer_top)
+	jmp	L(integer_top)
 
 EPILOGUE()
 
diff --git a/mpn/x86/k6/aors_n.asm b/mpn/x86/k6/aors_n.asm
index c6b2792ed..579afbc45 100644
--- a/mpn/x86/k6/aors_n.asm
+++ b/mpn/x86/k6/aors_n.asm
@@ -74,7 +74,7 @@ deflit(UNROLL_THRESHOLD, 5)
 
 PROLOGUE(M4_function_nc)
 	movl	PARAM_CARRY, %eax
-	jmp	LF(M4_function_n,start)
+	jmp	L(start)
 EPILOGUE()
 
 
diff --git a/mpn/x86/k6/aorsmul_1.asm b/mpn/x86/k6/aorsmul_1.asm
index 862b259a5..c6e0f40a6 100644
--- a/mpn/x86/k6/aorsmul_1.asm
+++ b/mpn/x86/k6/aorsmul_1.asm
@@ -160,7 +160,7 @@ PROLOGUE(M4_function_1c)
 	pushl	%esi
 deflit(`FRAME',4)
 	movl	PARAM_CARRY, %esi
-	jmp	LF(M4_function_1,start_nc)
+	jmp	L(start_nc)
 EPILOGUE()
 
 PROLOGUE(M4_function_1)
diff --git a/mpn/x86/k6/mmx/popham.asm b/mpn/x86/k6/mmx/popham.asm
index 25d87bab8..06c08df4e 100644
--- a/mpn/x86/k6/mmx/popham.asm
+++ b/mpn/x86/k6/mmx/popham.asm
@@ -70,23 +70,19 @@ ifdef(`PIC',,`
 	RODATA
 	ALIGN(8)
 
-define(LS,
-m4_assert_numargs(1)
-`LF(M4_function,`$1')')
-
-LS(rodata_AAAAAAAAAAAAAAAA):
+L(rodata_AAAAAAAAAAAAAAAA):
 	.long	0xAAAAAAAA
 	.long	0xAAAAAAAA
 
-LS(rodata_3333333333333333):
+L(rodata_3333333333333333):
 	.long	0x33333333
 	.long	0x33333333
 
-LS(rodata_0F0F0F0F0F0F0F0F):
+L(rodata_0F0F0F0F0F0F0F0F):
 	.long	0x0F0F0F0F
 	.long	0x0F0F0F0F
 
-LS(rodata_000000FF000000FF):
+L(rodata_000000FF000000FF):
 	.long	0x000000FF
 	.long	0x000000FF
 ')
@@ -123,10 +119,10 @@ ifdef(`PIC',`
 	punpckldq %mm4, %mm4
 ',`
 
-	movq	LS(rodata_AAAAAAAAAAAAAAAA), %mm7
-	movq	LS(rodata_3333333333333333), %mm6
-	movq	LS(rodata_0F0F0F0F0F0F0F0F), %mm5
-	movq	LS(rodata_000000FF000000FF), %mm4
+	movq	L(rodata_AAAAAAAAAAAAAAAA), %mm7
+	movq	L(rodata_3333333333333333), %mm6
+	movq	L(rodata_0F0F0F0F0F0F0F0F), %mm5
+	movq	L(rodata_000000FF000000FF), %mm4
 ')
 
 define(REG_AAAAAAAAAAAAAAAA, %mm7)
diff --git a/mpn/x86/k6/mode1o.asm b/mpn/x86/k6/mode1o.asm
index 502914a2c..a0e4028ab 100644
--- a/mpn/x86/k6/mode1o.asm
+++ b/mpn/x86/k6/mode1o.asm
@@ -52,7 +52,7 @@ deflit(`FRAME',0)
 	pushl	%esi		FRAME_pushl()
 
 	movl	PARAM_CARRY, %edx
-	jmp	LF(mpn_modexact_1_odd,start_1c)
+	jmp	L(start_1c)
 
 ifdef(`PIC',`
 L(movl_eip_edi):
@@ -81,7 +81,7 @@ L(start_1c):
 	pushl	%ebp		FRAME_pushl()
 
 ifdef(`PIC',`
-	call	LF(mpn_modexact_1c_odd,movl_eip_edi)
+	call	L(movl_eip_edi)
 
 	addl	$_GLOBAL_OFFSET_TABLE_, %edi
 	C
diff --git a/mpn/x86/k6/mul_1.asm b/mpn/x86/k6/mul_1.asm
index c5f2d6def..eefb7595c 100644
--- a/mpn/x86/k6/mul_1.asm
+++ b/mpn/x86/k6/mul_1.asm
@@ -53,7 +53,7 @@ PROLOGUE(mpn_mul_1c)
 	pushl	%esi
 deflit(`FRAME',4)
 	movl	PARAM_CARRY, %esi
-	jmp	LF(mpn_mul_1,start_nc)
+	jmp	L(start_nc)
 EPILOGUE()
 
 
diff --git a/mpn/x86/k7/aors_n.asm b/mpn/x86/k7/aors_n.asm
index 80f0b4692..ad538e293 100644
--- a/mpn/x86/k7/aors_n.asm
+++ b/mpn/x86/k7/aors_n.asm
@@ -95,7 +95,7 @@ deflit(`FRAME',0)
 
 PROLOGUE(M4_function_nc)
 	movl	PARAM_CARRY, %eax
-	jmp	LF(M4_function_n,start)
+	jmp	L(start)
 EPILOGUE()
 
 PROLOGUE(M4_function_n)
diff --git a/mpn/x86/k7/aorsmul_1.asm b/mpn/x86/k7/aorsmul_1.asm
index fb6e36ed9..29d418579 100644
--- a/mpn/x86/k7/aorsmul_1.asm
+++ b/mpn/x86/k7/aorsmul_1.asm
@@ -93,7 +93,7 @@ PROLOGUE(M4_function_1)
 	xorl	%ecx, %ecx
 
 	decl	%edx
-	jnz	LF(M4_function_1c,start_1)
+	jnz	L(start_1)
 
 	movl	(%eax), %eax
 	movl	PARAM_DST, %ecx
diff --git a/mpn/x86/k7/gcd_1.asm b/mpn/x86/k7/gcd_1.asm
index 3ff87d7a1..6c683c373 100644
--- a/mpn/x86/k7/gcd_1.asm
+++ b/mpn/x86/k7/gcd_1.asm
@@ -50,7 +50,7 @@ deflit(MAXSHIFT, 6)
 
 	TEXT
 	ALIGN(64)
-LF(mpn_gcd_1,table):
+L(table):
 	.byte	MAXSHIFT
 forloop(i,1,MASK,
 `	.byte	m4_count_trailing_zeros(i)
diff --git a/mpn/x86/k7/mmx/divrem_1.asm b/mpn/x86/k7/mmx/divrem_1.asm
index 5fce5a2ea..ef5b37b5f 100644
--- a/mpn/x86/k7/mmx/divrem_1.asm
+++ b/mpn/x86/k7/mmx/divrem_1.asm
@@ -105,7 +105,7 @@ deflit(`FRAME',STACK_SPACE)
 	movl	PARAM_SRC, %esi
 
 	leal	-4(%edi,%ebx,4), %edi
-	jmp	LF(mpn_divrem_1,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/k7/mmx/mod_1.asm b/mpn/x86/k7/mmx/mod_1.asm
index 26022eeb9..192a9f360 100644
--- a/mpn/x86/k7/mmx/mod_1.asm
+++ b/mpn/x86/k7/mmx/mod_1.asm
@@ -101,13 +101,13 @@ deflit(`FRAME',0)
 
 	movl	$32, %ebx			C 32-l
 	decl	%eax
-	jz	LF(mpn_mod_1,inverse_one_left)	C size==2, one divide
+	jz	L(inverse_one_left)		C size==2, one divide
 
 	movd	%ebx, %mm7			C 32-l
 	decl	%eax
-	jz	LF(mpn_mod_1,inverse_two_left)	C size==3, two divides
+	jz	L(inverse_two_left)		C size==3, two divides
 
-	jmp	LF(mpn_mod_1,inverse_top)	C size>=4
+	jmp	L(inverse_top)			C size>=4
 
 
 L(done_edi):
@@ -136,7 +136,7 @@ deflit(`FRAME',STACK_SPACE)
 
 	movl	%esi, SAVE_ESI
 	movl	PARAM_SRC, %esi
-	jmp	LF(mpn_mod_1,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/k7/mmx/popham.asm b/mpn/x86/k7/mmx/popham.asm
index 028600d9c..61e009fcc 100644
--- a/mpn/x86/k7/mmx/popham.asm
+++ b/mpn/x86/k7/mmx/popham.asm
@@ -73,19 +73,15 @@ ifdef(`PIC',,`
 	RODATA
 	ALIGN(8)
 
-define(LS,
-m4_assert_numargs(1)
-`LF(M4_function,`$1')')
-
-LS(rodata_AAAAAAAAAAAAAAAA):
+L(rodata_AAAAAAAAAAAAAAAA):
 	.long	0xAAAAAAAA
 	.long	0xAAAAAAAA
 
-LS(rodata_3333333333333333):
+L(rodata_3333333333333333):
 	.long	0x33333333
 	.long	0x33333333
 
-LS(rodata_0F0F0F0F0F0F0F0F):
+L(rodata_0F0F0F0F0F0F0F0F):
 	.long	0x0F0F0F0F
 	.long	0x0F0F0F0F
 ')
@@ -116,9 +112,9 @@ ifdef(`PIC',`
 	punpckldq %mm5, %mm5
 
 ',`
-	movq	LS(rodata_AAAAAAAAAAAAAAAA), %mm7
-	movq	LS(rodata_3333333333333333), %mm6
-	movq	LS(rodata_0F0F0F0F0F0F0F0F), %mm5
+	movq	L(rodata_AAAAAAAAAAAAAAAA), %mm7
+	movq	L(rodata_3333333333333333), %mm6
+	movq	L(rodata_0F0F0F0F0F0F0F0F), %mm5
 ')
 	pxor	%mm4, %mm4
 
diff --git a/mpn/x86/k7/mode1o.asm b/mpn/x86/k7/mode1o.asm
index ce8954d4c..5888e42d0 100644
--- a/mpn/x86/k7/mode1o.asm
+++ b/mpn/x86/k7/mode1o.asm
@@ -55,7 +55,7 @@ PROLOGUE(mpn_modexact_1c_odd)
 deflit(`FRAME',0)
 
 	movl	PARAM_CARRY, %ecx
-	jmp	LF(mpn_modexact_1_odd,start_1c)
+	jmp	L(start_1c)
 
 
 ifdef(`PIC',`
@@ -86,7 +86,7 @@ L(start_1c):
 	andl	$127, %eax
 
 ifdef(`PIC',`
-	call	LF(mpn_modexact_1c_odd,movl_eip_edi)
+	call	L(movl_eip_edi)
 	addl	$_GLOBAL_OFFSET_TABLE_, %edi
 	movl	modlimb_invert_table@GOT(%edi), %edi
 	movzbl	(%eax,%edi), %edi			C inv 8 bits
diff --git a/mpn/x86/k7/mul_1.asm b/mpn/x86/k7/mul_1.asm
index 2868ed3f6..e60a8fb3b 100644
--- a/mpn/x86/k7/mul_1.asm
+++ b/mpn/x86/k7/mul_1.asm
@@ -81,7 +81,7 @@ deflit(UNROLL_THRESHOLD, 5)
 PROLOGUE(mpn_mul_1c)
 deflit(`FRAME',0)
 	movl	PARAM_CARRY, %edx
-	jmp	LF(mpn_mul_1,start_nc)
+	jmp	L(start_nc)
 EPILOGUE()
 
 
diff --git a/mpn/x86/mod_1.asm b/mpn/x86/mod_1.asm
index 4a96f0b49..97aa308b7 100644
--- a/mpn/x86/mod_1.asm
+++ b/mpn/x86/mod_1.asm
@@ -60,7 +60,7 @@ deflit(`FRAME',0)
 	orl	%ecx, %ecx
 
 	movl	PARAM_CARRY, %edx
-	jnz	LF(mpn_mod_1,top)
+	jnz	L(top)
 
 	popl	%esi
 	movl	%edx, %eax
diff --git a/mpn/x86/p6/aorsmul_1.asm b/mpn/x86/p6/aorsmul_1.asm
index 7ba2bec51..ba3e5146f 100644
--- a/mpn/x86/p6/aorsmul_1.asm
+++ b/mpn/x86/p6/aorsmul_1.asm
@@ -89,7 +89,7 @@ PROLOGUE(M4_function_1c)
 	pushl	%ebx
 deflit(`FRAME',4)
 	movl	PARAM_CARRY, %ebx
-	jmp	LF(M4_function_1,start_nc)
+	jmp	L(start_nc)
 EPILOGUE()
 
 PROLOGUE(M4_function_1)
diff --git a/mpn/x86/p6/mmx/divrem_1.asm b/mpn/x86/p6/mmx/divrem_1.asm
index e07387498..36a0d9837 100644
--- a/mpn/x86/p6/mmx/divrem_1.asm
+++ b/mpn/x86/p6/mmx/divrem_1.asm
@@ -96,7 +96,7 @@ deflit(`FRAME',STACK_SPACE)
 	movl	PARAM_SRC, %esi
 
 	leal	-4(%edi,%ebx,4), %edi
-	jmp	LF(mpn_divrem_1,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/p6/mod_1.asm b/mpn/x86/p6/mod_1.asm
index c0e775366..5ffbb568c 100644
--- a/mpn/x86/p6/mod_1.asm
+++ b/mpn/x86/p6/mod_1.asm
@@ -141,9 +141,9 @@ deflit(`FRAME',0)
 
 	cmovc(	%esi, %edi)		C restore if underflow
 	decl	%ebx
-	jnz	LF(mpn_mod_1,preinv_entry)
+	jnz	L(preinv_entry)
 
-	jmp	LF(mpn_mod_1,done_edi)
+	jmp	L(done_edi)
 
 EPILOGUE()
 
@@ -163,7 +163,7 @@ deflit(`FRAME',0)
 
 	movl	PARAM_SRC, %esi
 	orl	%ecx, %ecx
-	jz	LF(mpn_mod_1,done_edx)	C result==carry if size==0
+	jz	L(done_edx)		C result==carry if size==0
 
 	sarl	$31, %eax
 	movl	PARAM_DIVISOR, %ebp
@@ -173,7 +173,7 @@ deflit(`FRAME',0)
 	addl	$MUL_UNNORM_THRESHOLD, %eax
 
 	cmpl	%eax, %ecx
-	jb	LF(mpn_mod_1,divide_top)
+	jb	L(divide_top)
 
 
 	C The carry parameter pretends to be the src high limb.
@@ -182,7 +182,7 @@ deflit(`FRAME',0)
 	leal	1(%ecx), %ebx		C size+1
 
 	movl	%edx, %eax		C carry
-	jmp	LF(mpn_mod_1,mul_by_inverse_1c)
+	jmp	L(mul_by_inverse_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/p6/mode1o.asm b/mpn/x86/p6/mode1o.asm
index c4281b444..2f01e6646 100644
--- a/mpn/x86/p6/mode1o.asm
+++ b/mpn/x86/p6/mode1o.asm
@@ -51,7 +51,7 @@ PROLOGUE(mpn_modexact_1c_odd)
 deflit(`FRAME',0)
 
 	movl	PARAM_CARRY, %ecx
-	jmp	LF(mpn_modexact_1_odd,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium/aors_n.asm b/mpn/x86/pentium/aors_n.asm
index f19da9c67..bc190776c 100644
--- a/mpn/x86/pentium/aors_n.asm
+++ b/mpn/x86/pentium/aors_n.asm
@@ -82,13 +82,13 @@ deflit(`FRAME',16)
 FRAME_pushl()
 	movl	PARAM_CARRY,%eax
 	shrl	$1,%eax			C shift bit 0 into carry
-	jmp	LF(M4_function_n,oop)
+	jmp	L(oop)
 
 L(endgo):
 deflit(`FRAME',16)
 	movl	PARAM_CARRY,%eax
 	shrl	$1,%eax			C shift bit 0 into carry
-	jmp	LF(M4_function_n,end)
+	jmp	L(end)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium/aorsmul_1.asm b/mpn/x86/pentium/aorsmul_1.asm
index 251dd320f..ae68fe08f 100644
--- a/mpn/x86/pentium/aorsmul_1.asm
+++ b/mpn/x86/pentium/aorsmul_1.asm
@@ -69,7 +69,7 @@ deflit(`FRAME',0)
 	movl	PARAM_CARRY, %ecx
 	pushl	%esi		FRAME_pushl()
 
-	jmp	LF(M4_function_1,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium/mod_1.asm b/mpn/x86/pentium/mod_1.asm
index a70ddb017..418f7ca2e 100644
--- a/mpn/x86/pentium/mod_1.asm
+++ b/mpn/x86/pentium/mod_1.asm
@@ -105,7 +105,7 @@ deflit(`FRAME',0)
 	movl	$0, VAR_NORM
 	decl	%edx
 
-	jnz	LF(mpn_mod_1,start_preinv)
+	jnz	L(start_preinv)
 
 	subl	%ebp, %edi		C src-divisor
 	popl	%ebx
@@ -137,7 +137,7 @@ deflit(`FRAME',0)
 	movl	PARAM_CARRY, %edx
 
 	orl	%ecx, %ecx
-	jz	LF(mpn_mod_1,done_edx)		C result==carry if size==0
+	jz	L(done_edx)			C result==carry if size==0
 
 	andl	$MUL_NORM_DELTA, %eax
 	pushl	%ebp		FRAME_pushl()
@@ -149,13 +149,13 @@ deflit(`FRAME',0)
 	movl	PARAM_DIVISOR, %ebp
 
 	cmpl	%eax, %ecx
-	jb	LF(mpn_mod_1,divide_top)
+	jb	L(divide_top)
 
 	movl	%edx, %eax		C carry as pretend src high limb
 	leal	1(%ecx), %edx		C size+1
 
 	cmpl	$0x1000000, %ebp
-	jmp	LF(mpn_mod_1,mul_by_inverse_1c)
+	jmp	L(mul_by_inverse_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium/mode1o.asm b/mpn/x86/pentium/mode1o.asm
index e54fccf47..2f74463c7 100644
--- a/mpn/x86/pentium/mode1o.asm
+++ b/mpn/x86/pentium/mode1o.asm
@@ -60,7 +60,7 @@ deflit(`FRAME',0)
 	movl	PARAM_DIVISOR, %eax
 	movl	PARAM_CARRY, %edx
 
-	jmp	LF(mpn_modexact_1_odd,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium/mul_1.asm b/mpn/x86/pentium/mul_1.asm
index 36606862a..9e727a08f 100644
--- a/mpn/x86/pentium/mul_1.asm
+++ b/mpn/x86/pentium/mul_1.asm
@@ -46,7 +46,7 @@ deflit(`FRAME',0)
 	movl	PARAM_CARRY, %ecx
 	pushl	%esi		FRAME_pushl()
 
-	jmp	LF(mpn_mul_1,start_1c)
+	jmp	L(start_1c)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium4/mmx/popham.asm b/mpn/x86/pentium4/mmx/popham.asm
index 708391143..ebcdb9197 100644
--- a/mpn/x86/pentium4/mmx/popham.asm
+++ b/mpn/x86/pentium4/mmx/popham.asm
@@ -69,13 +69,13 @@ ifdef(`PIC',,`
 	dnl  non-PIC
 	RODATA
 	ALIGN(8)
-LF(M4_function,rodata_AAAAAAAAAAAAAAAA):
+L(rodata_AAAAAAAAAAAAAAAA):
 	.long	0xAAAAAAAA
 	.long	0xAAAAAAAA
-LF(M4_function,rodata_3333333333333333):
+L(rodata_3333333333333333):
 	.long	0x33333333
 	.long	0x33333333
-LF(M4_function,rodata_0F0F0F0F0F0F0F0F):
+L(rodata_0F0F0F0F0F0F0F0F):
 	.long	0x0F0F0F0F
 	.long	0x0F0F0F0F
 ')
diff --git a/mpn/x86/pentium4/sse2/add_n.asm b/mpn/x86/pentium4/sse2/add_n.asm
index e5ad6496e..c67d4b9d9 100644
--- a/mpn/x86/pentium4/sse2/add_n.asm
+++ b/mpn/x86/pentium4/sse2/add_n.asm
@@ -49,7 +49,7 @@ PROLOGUE(mpn_add_nc)
 deflit(`FRAME',0)
 
 	movd	PARAM_CARRY, %mm0
-	jmp	LF(mpn_add_n,start_nc)
+	jmp	L(start_nc)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium4/sse2/addmul_1.asm b/mpn/x86/pentium4/sse2/addmul_1.asm
index be76a1b4c..d0e0bf10c 100644
--- a/mpn/x86/pentium4/sse2/addmul_1.asm
+++ b/mpn/x86/pentium4/sse2/addmul_1.asm
@@ -47,7 +47,7 @@ defframe(PARAM_DST,       4)
 PROLOGUE(mpn_addmul_1c)
 deflit(`FRAME',0)
 	movd	PARAM_CARRY, %mm0
-	jmp	LF(mpn_addmul_1,start_1c)
+	jmp	L(start_1c)
 EPILOGUE()
 
 PROLOGUE(mpn_addmul_1)
diff --git a/mpn/x86/pentium4/sse2/diveby3.asm b/mpn/x86/pentium4/sse2/diveby3.asm
index 06dc85fab..fade75a1f 100644
--- a/mpn/x86/pentium4/sse2/diveby3.asm
+++ b/mpn/x86/pentium4/sse2/diveby3.asm
@@ -52,7 +52,7 @@ defframe(PARAM_DST,   4)
 	RODATA
 C multiplicative inverse of 3, modulo 2^32
 	ALIGN(4)
-LF(mpn_divexact_by3c,inverse):
+L(inverse):
 	.long	0xAAAAAAAB
 
 	TEXT
diff --git a/mpn/x86/pentium4/sse2/mode1o.asm b/mpn/x86/pentium4/sse2/mode1o.asm
index f549ac502..191d07127 100644
--- a/mpn/x86/pentium4/sse2/mode1o.asm
+++ b/mpn/x86/pentium4/sse2/mode1o.asm
@@ -42,7 +42,7 @@ PROLOGUE(mpn_modexact_1c_odd)
 deflit(`FRAME',0)
 
 	movd	PARAM_CARRY, %mm1
-	jmp	LF(mpn_modexact_1_odd,start_1c)
+	jmp	L(start_1c)
 
 ifdef(`PIC',`
 L(movl_eip_edx):
@@ -68,7 +68,7 @@ L(start_1c):
 	andl	$127, %eax		C d/2, 7 bits
 
 ifdef(`PIC',`
-	call	LF(mpn_modexact_1c_odd,movl_eip_edx)
+	call	L(movl_eip_edx)
 
 	addl	$_GLOBAL_OFFSET_TABLE_, %edx
 
diff --git a/mpn/x86/pentium4/sse2/mul_1.asm b/mpn/x86/pentium4/sse2/mul_1.asm
index 55d909aa4..9bf9dea1f 100644
--- a/mpn/x86/pentium4/sse2/mul_1.asm
+++ b/mpn/x86/pentium4/sse2/mul_1.asm
@@ -44,7 +44,7 @@ defframe(PARAM_DST,       4)
 PROLOGUE(mpn_mul_1c)
 deflit(`FRAME',0)
 	movd	PARAM_CARRY, %mm0
-	jmp	LF(mpn_mul_1,start_1c)
+	jmp	L(start_1c)
 EPILOGUE()
 
 PROLOGUE(mpn_mul_1)
diff --git a/mpn/x86/pentium4/sse2/sub_n.asm b/mpn/x86/pentium4/sse2/sub_n.asm
index 2e1eb6318..ff4004d9a 100644
--- a/mpn/x86/pentium4/sse2/sub_n.asm
+++ b/mpn/x86/pentium4/sse2/sub_n.asm
@@ -49,7 +49,7 @@ PROLOGUE(mpn_sub_nc)
 deflit(`FRAME',0)
 
 	movd	PARAM_CARRY, %mm0
-	jmp	LF(mpn_sub_n,start_nc)
+	jmp	L(start_nc)
 
 EPILOGUE()
 
diff --git a/mpn/x86/pentium4/sse2/submul_1.asm b/mpn/x86/pentium4/sse2/submul_1.asm
index 2db3d2c4f..558cb1ca5 100644
--- a/mpn/x86/pentium4/sse2/submul_1.asm
+++ b/mpn/x86/pentium4/sse2/submul_1.asm
@@ -74,7 +74,7 @@ defframe(PARAM_DST,       4)
 PROLOGUE(mpn_submul_1c)
 deflit(`FRAME',0)
 	movd	PARAM_CARRY, %mm1
-	jmp	LF(mpn_submul_1,start_1c)
+	jmp	L(start_1c)
 EPILOGUE()
 
 PROLOGUE(mpn_submul_1)
diff --git a/mpn/x86/x86-defs.m4 b/mpn/x86/x86-defs.m4
index f0bbf107f..5d7e321d7 100644
--- a/mpn/x86/x86-defs.m4
+++ b/mpn/x86/x86-defs.m4
@@ -114,37 +114,6 @@ m4_assert_numargs(1)
 ')')')
 
 
-dnl  Usage: L(labelname)
-dnl         LF(functionname,labelname)
-dnl
-dnl  Generate a local label in the current or given function.  For LF(),
-dnl  functionname gets GSYM_PREFIX added, the same as with PROLOGUE().
-dnl
-dnl  For example, in a function mpn_add_n (and with MPN_PREFIX __gmpn),
-dnl
-dnl         L(bar)          => L__gmpn_add_n__bar
-dnl         LF(somefun,bar) => Lsomefun__bar
-dnl
-dnl  The function name and label name get two underscores between them
-dnl  rather than one to guard against clashing with a separate external
-dnl  symbol that happened to be called functionname_labelname.  (Though this
-dnl  would only happen if the local label prefix is is empty.)  Underscores
-dnl  are used so the whole label will still be a valid C identifier and so
-dnl  can be easily used in gdb.
-
-dnl  LSYM_PREFIX can be L$, so defn() is used to prevent L expanding as the
-dnl  L macro and making an infinite recursion.
-define(LF,
-m4_assert_numargs(2)
-m4_assert_defined(`LSYM_PREFIX')
-`defn(`LSYM_PREFIX')GSYM_PREFIX`'$1`'__$2')
-
-define(`L',
-m4_assert_numargs(1)
-PROLOGUE_assert_inside()
-`LF(PROLOGUE_current_function,`$1')')
-
-
 dnl  Called: PROLOGUE_cpu(gsym)
 dnl          EPILOGUE_cpu(gsym)