r5010 - glibc-package/trunk/debian/patches/hurd-i386
Author: sthibault
Date: 2011-10-27 00:45:46 +0000 (Thu, 27 Oct 2011)
New Revision: 5010
Modified:
glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff
glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-gscope.diff
glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-longjmp_chk.diff
Log:
reorder hooks to better match topgit
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff 2011-10-27 00:30:53 UTC (rev 5009)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-extern_inline.diff 2011-10-27 00:45:46 UTC (rev 5010)
@@ -478,6 +478,13 @@
+--- a/mach/spin-lock.c
++++ b/mach/spin-lock.c
+@@ -1,3 +1,4 @@
++#define __USE_EXTERN_INLINES 1
+ #define _EXTERN_INLINE /* Empty to define the real functions. */
+ #include "spin-lock.h"
+
--- a/sysdeps/generic/machine-lock.h
+++ b/sysdeps/generic/machine-lock.h
@@ -35,14 +35,21 @@
@@ -540,69 +547,6 @@
+#endif
#endif /* machine-sp.h */
---- a/ports/sysdeps/mach/alpha/machine-lock.h
-+++ b/ports/sysdeps/mach/alpha/machine-lock.h
-@@ -35,15 +35,22 @@
-
- /* Unlock LOCK. */
-
-+void __spin_unlock (__spin_lock_t *__lock);
-+
-+#ifdef __USE_EXTERN_INLINES
- _EXTERN_INLINE void
- __spin_unlock (__spin_lock_t *__lock)
- {
- __asm__ __volatile__ ("mb; stq $31, %0; mb"
- : "=m" (__lock));
- }
-+#endif
-
- /* Try to lock LOCK; return nonzero if we locked it, zero if another has. */
-
-+int __spin_try_lock (register __spin_lock_t *__lock);
-+
-+#ifdef __USE_EXTERN_INLINES
- _EXTERN_INLINE int
- __spin_try_lock (register __spin_lock_t *__lock)
- {
-@@ -67,14 +74,19 @@
- /* RTN is now nonzero; we have the lock. */
- return __rtn;
- }
-+#endif
-
- /* Return nonzero if LOCK is locked. */
-
-+int __spin_lock_locked (__spin_lock_t *__lock);
-+
-+#ifdef __USE_EXTERN_INLINES
- _EXTERN_INLINE int
- __spin_lock_locked (__spin_lock_t *__lock)
- {
- return *__lock != 0;
- }
-+#endif
-
-
- #endif /* machine-lock.h */
---- a/ports/sysdeps/mach/alpha/machine-sp.h
-+++ b/ports/sysdeps/mach/alpha/machine-sp.h
-@@ -26,11 +26,15 @@
- #define _EXTERN_INLINE __extern_inline
- #endif
-
-+void * __thread_stack_pointer (void);
-+
-+#ifdef __USE_EXTERN_INLINES
- _EXTERN_INLINE void *
- __thread_stack_pointer (void)
- {
- register void *__sp__ __asm__ ("$30");
- return __sp__;
- }
-+#endif
-
- #endif /* machine-sp.h */
--- a/sysdeps/mach/i386/machine-lock.h
+++ b/sysdeps/mach/i386/machine-lock.h
@@ -35,6 +35,9 @@
@@ -716,10 +660,3 @@
+#endif
#endif /* machine-sp.h */
---- a/mach/spin-lock.c
-+++ b/mach/spin-lock.c
-@@ -1,3 +1,4 @@
-+#define __USE_EXTERN_INLINES 1
- #define _EXTERN_INLINE /* Empty to define the real functions. */
- #include "spin-lock.h"
-
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff 2011-10-27 00:30:53 UTC (rev 5009)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff 2011-10-27 00:45:46 UTC (rev 5010)
@@ -33,6 +33,20 @@
#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */
#define ELFOSABI_AIX 7 /* IBM AIX. */
#define ELFOSABI_IRIX 8 /* SGI Irix. */
+diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
+index e79af1d..7c86609 100644
+--- a/sysdeps/mach/hurd/i386/init-first.c
++++ b/sysdeps/mach/hurd/i386/init-first.c
+@@ -37,9 +37,6 @@ extern void __init_misc (int, char **, char **);
+ #ifdef USE_NONOPTION_FLAGS
+ extern void __getopt_clean_environment (char **);
+ #endif
+-#ifndef SHARED
+-extern void _dl_non_dynamic_init (void) internal_function;
+-#endif
+ extern void __libc_global_ctors (void);
+
+ unsigned int __hurd_threadvar_max;
diff --git a/sysdeps/mach/hurd/ldsodefs.h b/sysdeps/mach/hurd/ldsodefs.h
index e69de29..56e4b03 100644
--- a/sysdeps/mach/hurd/ldsodefs.h
@@ -90,6 +104,20 @@
+ }
+
+#endif /* ldsodefs.h */
+diff --git a/sysdeps/mach/hurd/powerpc/init-first.c b/sysdeps/mach/hurd/powerpc/init-first.c
+index 21b5054..2047cac 100644
+--- a/sysdeps/mach/hurd/powerpc/init-first.c
++++ b/sysdeps/mach/hurd/powerpc/init-first.c
+@@ -32,9 +32,6 @@ extern void __init_misc (int, char **, char **);
+ #ifdef USE_NONOPTION_FLAGS
+ extern void __getopt_clean_environment (char **);
+ #endif
+-#ifndef SHARED
+-extern void _dl_non_dynamic_init (void) internal_function;
+-#endif
+ extern void __libc_global_ctors (void);
+
+ unsigned int __hurd_threadvar_max;
diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h
index 5d5b1b4..cf20217 100644
--- a/sysdeps/unix/sysv/linux/ldsodefs.h
@@ -115,31 +143,3 @@
}
#endif /* ldsodefs.h */
-diff --git a/sysdeps/mach/hurd/powerpc/init-first.c b/sysdeps/mach/hurd/powerpc/init-first.c
-index 21b5054..2047cac 100644
---- a/sysdeps/mach/hurd/powerpc/init-first.c
-+++ b/sysdeps/mach/hurd/powerpc/init-first.c
-@@ -32,9 +32,6 @@ extern void __init_misc (int, char **, char **);
- #ifdef USE_NONOPTION_FLAGS
- extern void __getopt_clean_environment (char **);
- #endif
--#ifndef SHARED
--extern void _dl_non_dynamic_init (void) internal_function;
--#endif
- extern void __libc_global_ctors (void);
-
- unsigned int __hurd_threadvar_max;
-diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
-index e79af1d..7c86609 100644
---- a/sysdeps/mach/hurd/i386/init-first.c
-+++ b/sysdeps/mach/hurd/i386/init-first.c
-@@ -37,9 +37,6 @@ extern void __init_misc (int, char **, char **);
- #ifdef USE_NONOPTION_FLAGS
- extern void __getopt_clean_environment (char **);
- #endif
--#ifndef SHARED
--extern void _dl_non_dynamic_init (void) internal_function;
--#endif
- extern void __libc_global_ctors (void);
-
- unsigned int __hurd_threadvar_max;
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff 2011-10-27 00:30:53 UTC (rev 5009)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff 2011-10-27 00:45:46 UTC (rev 5010)
@@ -23,24 +23,6 @@
sysdeps/mach/hurd/xstatconv.c | 9 ++----
2 files changed, 46 insertions(+), 19 deletions(-)
---- a/sysdeps/mach/hurd/xstatconv.c
-+++ b/sysdeps/mach/hurd/xstatconv.c
-@@ -42,12 +42,9 @@
- buf->st_uid = buf64->st_uid;
- buf->st_gid = buf64->st_gid;
- buf->st_size = buf64->st_size;
-- buf->st_atime = buf64->st_atime;
-- buf->st_atime_usec = buf64->st_atime_usec;
-- buf->st_mtime = buf64->st_mtime;
-- buf->st_mtime_usec = buf64->st_mtime_usec;
-- buf->st_ctime = buf64->st_ctime;
-- buf->st_ctime_usec = buf64->st_ctime_usec;
-+ buf->st_atim = buf64->st_atim;
-+ buf->st_mtim = buf64->st_mtim;
-+ buf->st_ctim = buf64->st_ctim;
- buf->st_blksize = buf64->st_blksize;
- buf->st_blocks = buf64->st_blocks;
- buf->st_author = buf64->st_author;
--- a/sysdeps/mach/hurd/bits/stat.h
+++ b/sysdeps/mach/hurd/bits/stat.h
@@ -59,12 +59,27 @@
@@ -120,3 +102,21 @@
/* Encoding of the file mode. */
+--- a/sysdeps/mach/hurd/xstatconv.c
++++ b/sysdeps/mach/hurd/xstatconv.c
+@@ -42,12 +42,9 @@
+ buf->st_uid = buf64->st_uid;
+ buf->st_gid = buf64->st_gid;
+ buf->st_size = buf64->st_size;
+- buf->st_atime = buf64->st_atime;
+- buf->st_atime_usec = buf64->st_atime_usec;
+- buf->st_mtime = buf64->st_mtime;
+- buf->st_mtime_usec = buf64->st_mtime_usec;
+- buf->st_ctime = buf64->st_ctime;
+- buf->st_ctime_usec = buf64->st_ctime_usec;
++ buf->st_atim = buf64->st_atim;
++ buf->st_mtim = buf64->st_mtim;
++ buf->st_ctim = buf64->st_ctim;
+ buf->st_blksize = buf64->st_blksize;
+ buf->st_blocks = buf64->st_blocks;
+ buf->st_author = buf64->st_author;
Modified: glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-gscope.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-gscope.diff 2011-10-27 00:30:53 UTC (rev 5009)
+++ glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-gscope.diff 2011-10-27 00:45:46 UTC (rev 5010)
@@ -29,6 +29,18 @@
#ifdef SHARED
};
# define __rtld_global_attribute__
+--- /dev/null
++++ b/sysdeps/mach/hurd/sysdep-cancel.h
+@@ -0,0 +1,9 @@
++#include <sysdep.h>
++
++/* Always multi-thread (since there's at least the sig handler), but no
++ handling enabled. */
++#define SINGLE_THREAD_P (0)
++#define RTLD_SINGLE_THREAD_P (0)
++#define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */
++#define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */
++#define LIBC_CANCEL_HANDLED() /* Nothing. */
--- a/sysdeps/mach/hurd/tls.h
+++ b/sysdeps/mach/hurd/tls.h
@@ -75,5 +75,18 @@
@@ -50,15 +62,3 @@
+#endif
#endif /* tls.h */
---- /dev/null
-+++ b/sysdeps/mach/hurd/sysdep-cancel.h
-@@ -0,0 +1,9 @@
-+#include <sysdep.h>
-+
-+/* Always multi-thread (since there's at least the sig handler), but no
-+ handling enabled. */
-+#define SINGLE_THREAD_P (0)
-+#define RTLD_SINGLE_THREAD_P (0)
-+#define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */
-+#define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */
-+#define LIBC_CANCEL_HANDLED() /* Nothing. */
Modified: glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-longjmp_chk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-longjmp_chk.diff 2011-10-27 00:30:53 UTC (rev 5009)
+++ glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-longjmp_chk.diff 2011-10-27 00:45:46 UTC (rev 5010)
@@ -10,6 +10,16 @@
sysdeps/mach/hurd/i386/signal-defines.sym | 10 ++
3 files changed, 122 insertions(+)
+--- a/sysdeps/mach/hurd/i386/Makefile
++++ b/sysdeps/mach/hurd/i386/Makefile
+@@ -2,3 +2,7 @@
+ sysdep_routines += ioperm
+ sysdep_headers += sys/io.h
+ endif
++
++ifeq ($(subdir),debug)
++gen-as-const-headers += signal-defines.sym
++endif
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S
@@ -0,0 +1,108 @@
@@ -134,13 +144,3 @@
+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)
---- a/sysdeps/mach/hurd/i386/Makefile
-+++ b/sysdeps/mach/hurd/i386/Makefile
-@@ -2,3 +2,7 @@
- sysdep_routines += ioperm
- sysdep_headers += sys/io.h
- endif
-+
-+ifeq ($(subdir),debug)
-+gen-as-const-headers += signal-defines.sym
-+endif
Reply to: