Update.

2003-07-11  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (__socket): Add
	cfi directives.
	* sysdeps/unix/sysv/linux/s390/s390-32/socket.S (__socket): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/socket.S (__socket): Likewise.

4 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e0097686c5..d979bd6a81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (__socket): Add
+	cfi directives.
+	* sysdeps/unix/sysv/linux/s390/s390-32/socket.S (__socket): Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-64/socket.S (__socket): Likewise.
+
 2003-07-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/powerpc/powerpc64/elf/start.S: Set section flags of
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S
index d406f08fdb..c52ad9babf 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1999, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -47,7 +47,9 @@
 
 	.text
 ENTRY(__socket)
+	cfi_startproc
 	stwu r1,-48(r1)
+	cfi_adjust_cfa_offset(48)
 #if NARGS >= 1
 	stw  r3,stackblock(r1)
 #endif
@@ -91,6 +93,7 @@ ENTRY(__socket)
 .Lsocket_cancel:
 	mflr	r9
 	stw	r9,52(r1)
+	cfi_offset (lr, 4)
 	CENABLE
 	stw	r3,16(r1)
 	li	r3,P(SOCKOP_,socket)
@@ -109,6 +112,7 @@ ENTRY(__socket)
 	addi	r1,r1,48
 	PSEUDO_RET
 #endif
+	cfi_endproc
 
 PSEUDO_END (__socket)
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/socket.S b/sysdeps/unix/sysv/linux/s390/s390-32/socket.S
index c4eb2cab0b..2047709647 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/socket.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/socket.S
@@ -47,12 +47,24 @@
 
 .globl __socket
 ENTRY(__socket)
+	cfi_startproc
 
 	/* Save registers and setup stack.  */
 	stm     %r6,%r15,24(%r15)       /* save registers */
+	cfi_offset (%r15, -36)
+	cfi_offset (%r14, -40)
+	cfi_offset (%r13, -44)
+	cfi_offset (%r12, -48)
+	cfi_offset (%r11, -52)
+	cfi_offset (%r10, -56)
+	cfi_offset (%r9, -60)
+	cfi_offset (%r8, -64)
+	cfi_offset (%r7, -68)
+	cfi_offset (%r6, -72)
 	lr      %r1,%r15
 	l       %r0,4(0,%r15)           /* load eos */
 	ahi     %r15,-120               /* buy stack space */
+	cfi_adjust_cfa_offset (120)
 	st      %r1,0(0,%r15)           /* store back chain */
 	st      %r0,4(0,%r15)           /* store eos */
 
@@ -124,6 +136,7 @@ L(socket_cancel):
 2:	.long	CENABLE-1b
 3:	.long	CDISABLE-1b
 #endif
+	cfi_endproc
 
 	SYSCALL_ERROR_HANDLER
 END (__socket)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/socket.S b/sysdeps/unix/sysv/linux/s390/s390-64/socket.S
index 3a2454eba4..3985a9c4b7 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/socket.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/socket.S
@@ -47,12 +47,24 @@
 
 .globl __socket
 ENTRY(__socket)
+	cfi_startproc
 
 	/* Save registers and setup stack.  */
         stmg    %r6,%r15,48(%r15)       /* Save registers.  */
+	cfi_offset (%r15,-40)
+	cfi_offset (%r14,-48)
+	cfi_offset (%r13,-56)
+	cfi_offset (%r12,-64)
+	cfi_offset (%r11,-72)
+	cfi_offset (%r10,-80)
+	cfi_offset (%r9,-88)
+	cfi_offset (%r8,-96)
+	cfi_offset (%r7,-104)
+	cfi_offset (%r6,-112)
         lgr     %r1,%r15
         lg      %r0,8(%r15)             /* Load eos.  */
         ahi     %r15,-208               /* Buy stack space.  */
+	cfi_adjust_cfa_offset (208)
         stg     %r1,0(%r15)             /* Store back chain.  */
         stg     %r0,8(%r15)             /* Store eos.  */
 
@@ -118,6 +130,8 @@ L(socket_cancel):
 	j	4b
 #endif
 
+	cfi_endproc
+
 PSEUDO_END (__socket)
 
 #ifndef NO_WEAK_ALIAS