[gentoo-commits] gentoo commit in src/patchsets/glibc/2.14.1: 6235_all_arm-sigreturn-cfi.patch 6236_all_arm-sigreturn-cfi-2.patch

[Mike Frysinger (vapier)]

vapier      12/01/02 22:53:27

  Modified:             6235_all_arm-sigreturn-cfi.patch
                        6236_all_arm-sigreturn-cfi-2.patch
  Log:
  add more documentation

Revision  Changes    Path
1.2                  src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch?r1=1.1&r2=1.2

Index: 6235_all_arm-sigreturn-cfi.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 6235_all_arm-sigreturn-cfi.patch	1 Jan 2012 09:43:04 -0000	1.1
+++ 6235_all_arm-sigreturn-cfi.patch	2 Jan 2012 22:53:27 -0000	1.2
@@ -1,10 +1,30 @@
-http://sourceware.org/bugzilla/show_bug.cgi?id=12354
+http://sourceware.org/ml/libc-ports/2012-01/msg00003.html
 
-fix build errors with newer binutils:
-../sysdeps/unix/sysv/linux/arm/sigrestorer.S: Assembler messages:
-../sysdeps/unix/sysv/linux/arm/sigrestorer.S:30: Error: previous CFI entry not closed (missing .cfi_endproc)
-../sysdeps/unix/sysv/linux/arm/sigrestorer.S:31: Error: open CFI at the end of file; missing .cfi_endproc directive
+From 86a3daff28268aec0c0907ab0a025dc28a35b27d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@g.o>
+Date: Sun, 1 Jan 2012 02:37:11 -0500
+Subject: [PATCH] arm: sigrestorer: fix cfi errors
 
+Building the sigrestorer code with newer binutils fails like so:
+.../arm/sigrestorer.S: Assembler messages:
+.../arm/sigrestorer.S:30: Error: previous CFI entry not closed (missing .cfi_endproc)
+.../arm/sigrestorer.S:31: Error: open CFI at the end of file; missing .cfi_endproc directive
+
+URL: http://sourceware.org/bugzilla/show_bug.cgi?id=12354
+Signed-off-by: Mike Frysinger <vapier@g.o>
+
[phone]  Mike Frysinger  <vapier@g.o>
+
+	PR glibc/12354
+	* sysdeps/unix/sysv/linux/arm/sigrestorer.S (__default_sa_restorer):
+	Add END(__default_sa_restorer).
+	(__default_rt_sa_restorer): Add END(__default_rt_sa_restorer).
+---
+ sysdeps/unix/sysv/linux/arm/sigrestorer.S |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/arm/sigrestorer.S b/sysdeps/unix/sysv/linux/arm/sigrestorer.S
+index 98e33cb..2b811d1 100644
 --- a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S
 +++ b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S
 @@ -24,10 +24,12 @@
@@ -20,4 +40,5 @@
 +END(__default_rt_sa_restorer)
  
  #endif
-
+-- 
+1.7.6.1



1.2                  src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch?r1=1.1&r2=1.2

Index: 6236_all_arm-sigreturn-cfi-2.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 6236_all_arm-sigreturn-cfi-2.patch	1 Jan 2012 09:43:04 -0000	1.1
+++ 6236_all_arm-sigreturn-cfi-2.patch	2 Jan 2012 22:53:27 -0000	1.2
@@ -1,4 +1,13 @@
-fix build errors with newer binutils:
+http://sourceware.org/ml/libc-ports/2012-01/msg00002.html
+
+From 16df464882693e90366a6f843a78536ec602051e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@g.o>
+Date: Mon, 2 Jan 2012 17:33:28 -0500
+Subject: [PATCH] arm: fix cfi errors with newer binutils
+
+When building code that uses the PSEUDO() in sysdep-cancel.h with
+newer binutils, we hit many failures like this:
+
 ../sysdeps/unix/syscall-template.S: Assembler messages:
 ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc
 ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc
@@ -6,6 +15,21 @@
 ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc
 make[2]: *** [build/misc/select.o] Error 1
 
+Change the local nocancl version to use the ENTRY/END macros rather
+than open coding it so we get automatic cfi handling.
+
+Signed-off-by: Mike Frysinger <vapier@g.o>
+
[phone]  Mike Frysinger  <vapier@g.o>
+
+	* sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (PSEUDO): Change
+	.type/.globl/label to ENTRY().  Change .size to END().
+---
+ sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+index 9c80771..76d9677 100644
 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
 +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
 @@ -28,12 +28,10 @@
@@ -23,3 +47,5 @@
    ENTRY (name);								\
      SINGLE_THREAD_P;							\
      DOARGS_##args;							\
+-- 
+1.7.6.1