r4090 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2010-01-17 19:57:16 +0000 (Sun, 17 Jan 2010)
New Revision: 4090
Added:
glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/local-longjmp_chk.diff
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
debian/patches/hurd-i386/local-longjmp_chk.diff: New patch to fix debug/____longjmp_chk.S build on hurd-i386.
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-01-17 17:31:53 UTC (rev 4089)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-01-17 19:57:16 UTC (rev 4090)
@@ -33,6 +33,8 @@
[ Samuel Thibault ]
* debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to
fix elf/ build on hurd-i386.
+ * debian/patches/hurd-i386/local-longjmp_chk.diff: New patch to fix
+ debug/____longjmp_chk.S build on hurd-i386.
-- Aurelien Jarno <aurel32@debian.org> Tue, 29 Dec 2009 01:10:49 +0100
Added: glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/local-longjmp_chk.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/local-longjmp_chk.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hurd-i386/local-longjmp_chk.diff 2010-01-17 19:57:16 UTC (rev 4090)
@@ -0,0 +1,145 @@
+From Thomas Schwinge.
+
+Provide ____longjmp_chk, still WIP.
+---
+ b/sysdeps/mach/hurd/i386/Makefile | 4 +
+ sysdeps/mach/hurd/i386/____longjmp_chk.S | 108 ++++++++++++++++++++++++++++++
+ sysdeps/mach/hurd/i386/signal-defines.sym | 10 ++
+ 3 files changed, 122 insertions(+)
+
+--- a/sysdeps/mach/hurd/i386/____longjmp_chk.S 2010-01-17 13:39:52.030010467 +0100
++++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S 2010-01-17 20:26:36.000000000 +0100
+@@ -0,0 +1,108 @@
++/* Copyright (C) 2001,2004,2005,2006,2009 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
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <sysdep.h>
++#include <jmpbuf-offsets.h>
++#include <asm-syntax.h>
++
++#include <signal-defines.h>
++/* #include <signal.h> */
++#define SS_ONSTACK 1
++
++
++ .section .rodata.str1.1,"aMS",@progbits,1
++ .type longjmp_msg,@object
++longjmp_msg:
++ .string "longjmp causes uninitialized stack frame"
++ .size longjmp_msg, .-longjmp_msg
++
++
++#ifdef PIC
++# define CALL_FAIL movl %ebx, %ecx; /* TODO: what's this mov good for? */ \
++ cfi_register(%ebx,%ecx); \
++ LOAD_PIC_REG (bx); \
++ leal longjmp_msg@GOTOFF(%ebx), %eax; \
++ call HIDDEN_JUMPTARGET(__fortify_fail)
++#else
++# define CALL_FAIL movl $longjmp_msg, %eax; \
++ call HIDDEN_JUMPTARGET(__fortify_fail)
++#endif
++
++
++ .text
++ENTRY (____longjmp_chk)
++ movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */
++
++ /* Save the return address now. */
++ movl (JB_PC*4)(%ecx), %edx
++ /* Get the stack pointer. */
++ movl (JB_SP*4)(%ecx), %edi
++ cfi_undefined(%edi)
++ PTR_DEMANGLE (%edx)
++ PTR_DEMANGLE (%edi)
++
++ cmpl %edi, %esp
++ /* Jumping to a higher-address frame is always allowed. */
++ jbe .Lok
++
++ /* Passing here, we're either about to do something invalid, or we're
++ executing on an alternative signal stack. */
++
++ /* TODO: need locking? */
++ /* struct hurd_sigstate * _hurd_self_sigstate (void) */
++ call _hurd_self_sigstate
++ /* TODO: %eax and %eax->sigaltstack are always valid? */
++
++ testl $SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%eax)
++ /* Fail if SS_ONSTACK is not set. */
++ jz .Lfail
++
++ movl (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SP__OFFSET)(%eax), %ebx
++ addl (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SIZE__OFFSET)(%eax), %ebx
++ subl %edi, %ebx
++ cmpl (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_SIZE__OFFSET)(%eax), %ebx
++ /* TODO: comment this calculation. */
++ jae .Lok
++
++.Lfail: CALL_FAIL
++
++.Lok: /* We add unwind information for the target here. */
++ cfi_def_cfa(%ecx, 0)
++ cfi_register(%eip, %edx)
++ cfi_register(%esp, %edi)
++ cfi_offset(%ebx, JB_BX*4)
++ cfi_offset(%esi, JB_SI*4)
++ cfi_offset(%edi, JB_DI*4)
++ cfi_offset(%ebp, JB_BP*4)
++
++ movl 8(%esp), %eax /* Second argument is return value. */
++ movl %edi, %esp
++
++ /* Restore registers. */
++ movl (JB_BX*4)(%ecx), %ebx
++ movl (JB_SI*4)(%ecx), %esi
++ movl (JB_DI*4)(%ecx), %edi
++ movl (JB_BP*4)(%ecx), %ebp
++ cfi_restore(%ebx)
++ cfi_restore(%esi)
++ cfi_restore(%edi)
++ cfi_restore(%ebp)
++
++ /* Jump to saved PC. */
++ jmp *%edx
++END (____longjmp_chk)
+--- a/sysdeps/mach/hurd/i386/signal-defines.sym
++++ b/sysdeps/mach/hurd/i386/signal-defines.sym
+@@ -0,0 +1,10 @@
++#include <hurd/signal.h>
++#include <signal.h>
++
++--
++
++HURD_SIGSTATE__SIGALTSTACK__OFFSET offsetof(struct hurd_sigstate, sigaltstack)
++
++SIGALTSTACK__SS_SP__OFFSET offsetof(struct sigaltstack, ss_sp)
++SIGALTSTACK__SS_SIZE__OFFSET offsetof(struct sigaltstack, ss_size)
++SIGALTSTACK__SS_FLAGS__OFFSET offsetof(struct sigaltstack, ss_flags)
+diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
+index 0eef17e..5f98809 100644
+--- a/sysdeps/mach/hurd/i386/Makefile
++++ b/sysdeps/mach/hurd/i386/Makefile
+@@ -2,3 +2,7 @@ ifeq ($(subdir),misc)
+ sysdep_routines += ioperm
+ sysdep_headers += sys/io.h
+ endif
++
++ifeq ($(subdir),debug)
++gen-as-const-headers += signal-defines.sym
++endif
Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series 2010-01-17 17:31:53 UTC (rev 4089)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series 2010-01-17 19:57:16 UTC (rev 4090)
@@ -102,6 +102,7 @@
hurd-i386/local-bigmem.diff
hurd-i386/local-disable-ioctls.diff
hurd-i386/submitted-rtld_lock_recursive.diff
+hurd-i386/local-longjmp_chk.diff
ia64/submitted-sysconf.diff
ia64/submitted-libm.diff
Reply to: