r2863 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibaul-guest
Date: 2008-03-10 00:45:44 +0000 (Mon, 10 Mar 2008)
New Revision: 2863
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/local-gcc-4.1-init-first.diff: Update and actually
apply.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-09 14:37:00 UTC (rev 2862)
+++ glibc-package/trunk/debian/changelog 2008-03-10 00:45:44 UTC (rev 2863)
@@ -30,6 +30,8 @@
core when a blocked exception arises.
* patches/hurd-i386/cvs-df.diff: new patch to clear DF for signal
handlers (Closes: #470021).
+ * patches/hurd-i386/local-gcc-4.1-init-first.diff: Update and actually
+ apply.
-- Aurelien Jarno <aurel32@debian.org> Sun, 09 Mar 2008 13:48:43 +0100
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff 2008-03-09 14:37:00 UTC (rev 2862)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff 2008-03-10 00:45:44 UTC (rev 2863)
@@ -6,9 +6,9 @@
CALLER and pass that one on.
(init): Avoid an ugly typecast.
---- sysdeps/mach/hurd/i386/init-first.c 23 Oct 2005 01:00:09 -0000 1.43.4.1
-+++ sysdeps/mach/hurd/i386/init-first.c 20 Nov 2006 11:05:47 -0000
-@@ -320,11 +320,11 @@ first_init (void)
+--- glibc-2.7/sysdeps/mach/hurd/i386/init-first.c.orig 2008-03-09 21:19:54.126246000 +0000
++++ glibc-2.7/sysdeps/mach/hurd/i386/init-first.c 2008-03-09 21:22:19.348744000 +0000
+@@ -334,11 +334,11 @@
stack set up just as the user will see it, so it can switch stacks. */
void
@@ -22,15 +22,16 @@
}
#endif
-@@ -351,23 +351,21 @@ strong_alias (posixland_init, __libc_ini
+@@ -365,23 +365,23 @@
This poorly-named function is called by static-start.S,
which should not exist at all. */
void
-_hurd_stack_setup (void)
-+_hurd_stack_setup (volatile int argc, ...)
++_hurd_stack_setup (void *arg, ...)
{
- intptr_t caller = (intptr_t) __builtin_return_address (0);
--
++ void *caller = (&arg)[-1];
+
void doinit (intptr_t *data)
{
/* This function gets called with the argument data at TOS. */
@@ -46,47 +47,15 @@
caller had called `doinit1' with the argument data already on the
stack. */
- *--data = caller;
-+ *--data = (&argc)[-1];
- asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack. */
- "movl $0, %%ebp\n" /* Clear outermost frame pointer. */
- "jmp *%1" : : "r" (data), "r" (&doinit1) : "sp");
-@@ -376,7 +374,7 @@ _hurd_stack_setup (void)
-
- first_init ();
-
-- _hurd_startup ((void **) __builtin_frame_address (0) + 2, &doinit);
-+ _hurd_startup ((void **) &argc, &doinit);
- }
- #endif
-
---- sysdeps/mach/hurd/i386/init-first.c 2007-07-22 16:50:03.000000000 +0200
-+++ sysdeps/mach/hurd/i386/init-first.c 2007-07-22 18:33:45.540000000 +0200
-@@ -350,8 +351,10 @@
- This poorly-named function is called by static-start.S,
- which should not exist at all. */
- void
--_hurd_stack_setup (volatile int argc, ...)
-+_hurd_stack_setup (void *arg, ...)
- {
-+ void *caller = (&arg)[-1];
-+
- void doinit (intptr_t *data)
- {
- /* This function gets called with the argument data at TOS. */
-@@ -364,7 +367,7 @@
- jump to `doinit1' (above), so it is as if __libc_init_first's
- caller had called `doinit1' with the argument data already on the
- stack. */
-- *--data = (&argc)[-1];
+ *--data = (intptr_t) caller;
asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack. */
"movl $0, %%ebp\n" /* Clear outermost frame pointer. */
"jmp *%1" : : "r" (data), "r" (&doinit1) : "sp");
-@@ -373,7 +376,7 @@
+@@ -391,7 +391,7 @@
first_init ();
-- _hurd_startup ((void **) &argc, &doinit);
+- _hurd_startup ((void **) __builtin_frame_address (0) + 2, &doinit);
+ _hurd_startup (&arg, &doinit);
}
#endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-03-09 14:37:00 UTC (rev 2862)
+++ glibc-package/trunk/debian/patches/series 2008-03-10 00:45:44 UTC (rev 2863)
@@ -77,6 +77,7 @@
hurd-i386/local-msg-nosignal.diff -p0
hurd-i386/local-tls.diff
hurd-i386/local-tls-support.diff -p0
+hurd-i386/local-gcc-4.1-init-first.diff
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-libc_once.diff -p0
hurd-i386/submitted-ptr-mangle.diff -p0
Reply to: