diff --git a/sysdeps/unix/bsd/sun/m68k/sethostid.S b/sysdeps/unix/bsd/sun/m68k/sethostid.S
index 7b128a1f77..8b30f3fe65 100644
--- a/sysdeps/unix/bsd/sun/m68k/sethostid.S
+++ b/sysdeps/unix/bsd/sun/m68k/sethostid.S
@@ -30,7 +30,7 @@ SYSCALL (sethostid, 1)
 .globl _sethostid
 .even
 _sethostid:
-	movel #ENOSYS, ___errno
+	movel #ENOSYS, _errno
 	moveq #-1, d0
 	rts
 
diff --git a/sysdeps/unix/bsd/sun/sparc/sethostid.S b/sysdeps/unix/bsd/sun/sparc/sethostid.S
index 709fcea326..fbafba5277 100644
--- a/sysdeps/unix/bsd/sun/sparc/sethostid.S
+++ b/sysdeps/unix/bsd/sun/sparc/sethostid.S
@@ -31,8 +31,8 @@ SYSCALL (sethostid, 1)
 
 ENTRY (sethostid)
 	mov ENOSYS, %o0
-	sethi %hi(___errno), %g1
-	st %o0, [%g1 + %lo(___errno)]
+	sethi %hi(_errno), %g1
+	st %o0, [%g1 + %lo(_errno)]
 	retl
 	sub %g0, 1, %o0
 
diff --git a/sysdeps/unix/sysv/i386/signal.S b/sysdeps/unix/sysv/i386/signal.S
index 6fd8113557..14ef77bdc5 100644
--- a/sysdeps/unix/sysv/i386/signal.S
+++ b/sysdeps/unix/sysv/i386/signal.S
@@ -22,10 +22,10 @@ Cambridge, MA 02139, USA.  */
    with the address of the `__sigreturn' function.  */
 
 	.globl syscall_error
-	.globl ___sigreturn
+	.globl C_SYMBOL_NAME(__sigreturn)
 ENTRY (signal)
 	lea SYS_signal, %eax
-	lea ___sigreturn, %edx
-	.byte 0x9a, 0, 0, 0, 0, 7, 0
+	lea C_SYMBOL_NAME(__sigreturn), %edx
+	.byte 0x9a, 0, 0, 0, 0, 7, 0 /* lcall $7, $0 -- GAS bug.  */
 	jb syscall_error
 	ret