Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo commit in src/patchsets/glibc/2.14.1: 6235_all_arm-sigreturn-cfi.patch 6236_all_arm-sigreturn-cfi-2.patch |
| Date: | Sun, 01 Jan 2012 09:43:14 |
| Message-Id: | 20120101094305.0600D2004B@flycatcher.gentoo.org |
| 1 | vapier 12/01/01 09:43:05 |
| 2 | |
| 3 | Added: 6235_all_arm-sigreturn-cfi.patch |
| 4 | 6236_all_arm-sigreturn-cfi-2.patch |
| 5 | Log: |
| 6 | fix building for arm with newer binutils (and cfi errors) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6235_all_arm-sigreturn-cfi.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: 6235_all_arm-sigreturn-cfi.patch |
| 15 | =================================================================== |
| 16 | http://sourceware.org/bugzilla/show_bug.cgi?id=12354 |
| 17 | |
| 18 | fix build errors with newer binutils: |
| 19 | ../sysdeps/unix/sysv/linux/arm/sigrestorer.S: Assembler messages: |
| 20 | ../sysdeps/unix/sysv/linux/arm/sigrestorer.S:30: Error: previous CFI entry not closed (missing .cfi_endproc) |
| 21 | ../sysdeps/unix/sysv/linux/arm/sigrestorer.S:31: Error: open CFI at the end of file; missing .cfi_endproc directive |
| 22 | |
| 23 | --- a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S |
| 24 | +++ b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S |
| 25 | @@ -24,10 +24,12 @@ |
| 26 | |
| 27 | ENTRY(__default_sa_restorer) |
| 28 | swi SYS_ify(sigreturn) |
| 29 | +END(__default_sa_restorer) |
| 30 | |
| 31 | #ifdef __NR_rt_sigreturn |
| 32 | |
| 33 | ENTRY(__default_rt_sa_restorer) |
| 34 | swi SYS_ify(rt_sigreturn) |
| 35 | +END(__default_rt_sa_restorer) |
| 36 | |
| 37 | #endif |
| 38 | |
| 39 | |
| 40 | |
| 41 | |
| 42 | 1.1 src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch |
| 43 | |
| 44 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch?rev=1.1&view=markup |
| 45 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.14.1/6236_all_arm-sigreturn-cfi-2.patch?rev=1.1&content-type=text/plain |
| 46 | |
| 47 | Index: 6236_all_arm-sigreturn-cfi-2.patch |
| 48 | =================================================================== |
| 49 | fix build errors with newer binutils: |
| 50 | ../sysdeps/unix/syscall-template.S: Assembler messages: |
| 51 | ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc |
| 52 | ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc |
| 53 | ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc |
| 54 | ../sysdeps/unix/syscall-template.S:82: Error: CFI instruction used without previous .cfi_startproc |
| 55 | make[2]: *** [build/misc/select.o] Error 1 |
| 56 | |
| 57 | --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h |
| 58 | +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h |
| 59 | @@ -28,12 +28,10 @@ |
| 60 | # define PSEUDO(name, syscall_name, args) \ |
| 61 | .section ".text"; \ |
| 62 | PSEUDO_PROLOGUE; \ |
| 63 | - .type __##syscall_name##_nocancel,%function; \ |
| 64 | - .globl __##syscall_name##_nocancel; \ |
| 65 | - __##syscall_name##_nocancel: \ |
| 66 | + ENTRY (__##syscall_name##_nocancel); \ |
| 67 | DO_CALL (syscall_name, args); \ |
| 68 | PSEUDO_RET; \ |
| 69 | - .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ |
| 70 | + END (__##syscall_name##_nocancel); \ |
| 71 | ENTRY (name); \ |
| 72 | SINGLE_THREAD_P; \ |
| 73 | DOARGS_##args; \ |