r4540 - glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386
Author: aurel32
Date: 2011-02-26 14:36:08 +0000 (Sat, 26 Feb 2011)
New Revision: 4540
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-atomic-no-multiple_threads.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-gscope.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-msg-nosignal.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-net.diff
Log:
Refresh hurd specific patches
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -3,8 +3,8 @@
---
Makerules | 1 +
1 file changed, 1 insertion(+)
---- a/Makerules.original 2011-02-21 02:30:30.000000000 +0000
-+++ b/Makerules 2011-02-21 02:33:37.000000000 +0000
+--- a/Makerules
++++ b/Makerules
@@ -1043,6 +1043,7 @@
echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-atomic-no-multiple_threads.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-atomic-no-multiple_threads.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-atomic-no-multiple_threads.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -2,7 +2,7 @@
the file (which would mean having to maintain it)
---
- atomic.h | 107 +++++++++++++++++++++------------------------------------------
+ sysdeps/i386/i486/bits/atomic.h | 107 +++++++++++++---------------------------
1 file changed, 37 insertions(+), 70 deletions(-)
--- a/sysdeps/i386/i486/bits/atomic.h
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-gscope.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-gscope.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-gscope.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -8,7 +8,7 @@
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
-@@ -141,6 +141,7 @@
+@@ -157,6 +157,7 @@
/* Function in libpthread to wait for termination of lookups. */
void (*_dl_wait_lookup_done) (void);
@@ -18,7 +18,7 @@
#ifdef NEED_DL_SYSINFO
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
-@@ -493,6 +493,7 @@
+@@ -515,6 +515,7 @@
size_t count;
void *list[50];
} *_dl_scope_free_list;
@@ -28,7 +28,7 @@
# define __rtld_global_attribute__
--- a/sysdeps/mach/hurd/tls.h
+++ b/sysdeps/mach/hurd/tls.h
-@@ -74,5 +74,18 @@
+@@ -75,5 +75,18 @@
#endif /* HAVE_TLS_SUPPORT */
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-msg-nosignal.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-msg-nosignal.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-msg-nosignal.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -11,12 +11,12 @@
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
-@@ -102,6 +102,8 @@
- #define MAXPACKET 65536
- #endif
+@@ -174,6 +174,8 @@
+ TIMEVAL_TO_TIMESPEC (&now, res);
+ }
+#undef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
- /* From ev_streams.c. */
-
+ /* Options. Leave them on. */
+ /* #undef DEBUG */
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -6,7 +6,7 @@
--- a/scripts/lib-names.awk
+++ b/scripts/lib-names.awk
-@@ -61,6 +61,8 @@ END {
+@@ -61,6 +61,8 @@
cmd = "LC_ALL=C sort"; print lines["DEFAULT"] | cmd; close(cmd);
}
@@ -17,7 +17,7 @@
}
--- a/nscd/Makefile
+++ b/nscd/Makefile
-@@ -36,7 +36,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
+@@ -43,7 +43,7 @@
# own copy of nis_hash.
nscd-modules += nis_hash
endif
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -17,7 +17,7 @@
--- a/Makerules
+++ b/Makerules
-@@ -979,7 +979,8 @@
+@@ -1042,7 +1042,8 @@
cat $<; \
echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-net.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-net.diff 2011-02-26 14:30:32 UTC (rev 4539)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-net.diff 2011-02-26 14:36:08 UTC (rev 4540)
@@ -51,44 +51,39 @@
* sysdeps/mach/hurd/net/route.h: Remove file.
---
- b/sysdeps/gnu/Makefile | 5
- b/sysdeps/gnu/net/ethernet.h | 84 +++++++++++++
- b/sysdeps/gnu/net/if_arp.h | 184 +++++++++++++++++++++++++++++
- b/sysdeps/gnu/net/if_ether.h | 116 ++++++++++++++++++
- b/sysdeps/gnu/net/if_ppp.h | 169 ++++++++++++++++++++++++++
- b/sysdeps/gnu/net/route.h | 145 ++++++++++++++++++++++
- b/sysdeps/gnu/netinet/if_ether.h | 104 ++++++++++++++++
- b/sysdeps/mach/hurd/Makefile | 5
- b/sysdeps/unix/sysv/linux/Makefile | 3
- b/sysdeps/unix/sysv/linux/net/if_ether.h | 7 +
+ sysdeps/gnu/Makefile | 5
+ sysdeps/gnu/net/ethernet.h | 84 +++++++++++++
+ sysdeps/gnu/net/if_arp.h | 184 +++++++++++++++++++++++++++++
+ sysdeps/gnu/net/if_ether.h | 116 ++++++++++++++++++
+ sysdeps/gnu/net/if_ppp.h | 169 ++++++++++++++++++++++++++
+ sysdeps/gnu/net/route.h | 145 ++++++++++++++++++++++
+ sysdeps/gnu/netinet/if_ether.h | 104 ++++++++++++++++
+ sysdeps/mach/hurd/Makefile | 5
sysdeps/mach/hurd/net/ethernet.h | 76 -----------
sysdeps/mach/hurd/net/if_arp.h | 145 ----------------------
sysdeps/mach/hurd/net/if_ether.h | 85 -------------
sysdeps/mach/hurd/net/if_ppp.h | 169 --------------------------
sysdeps/mach/hurd/net/route.h | 141 ----------------------
+ sysdeps/unix/sysv/linux/Makefile | 3
sysdeps/unix/sysv/linux/net/ethernet.h | 84 -------------
sysdeps/unix/sysv/linux/net/if_arp.h | 184 -----------------------------
+ sysdeps/unix/sysv/linux/net/if_ether.h | 7 +
sysdeps/unix/sysv/linux/net/if_ppp.h | 169 --------------------------
sysdeps/unix/sysv/linux/net/route.h | 145 ----------------------
sysdeps/unix/sysv/linux/netinet/if_ether.h | 105 ----------------
20 files changed, 815 insertions(+), 1310 deletions(-)
-diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
-index 5b9a0a5..b8ded38 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
-@@ -77,3 +77,8 @@ endif
- ifeq ($(subdir),misc)
- sysdep_headers += sys/mtio.h
+@@ -91,3 +91,8 @@
+ librt-shared-only-routines += rt-unwind-resume
+ CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
endif
+
+ifeq ($(subdir),socket)
+sysdep_headers += net/ethernet.h net/if_arp.h net/if_ether.h net/if_ppp.h \
+ net/route.h
+endif
-diff --git a/sysdeps/gnu/net/ethernet.h b/sysdeps/gnu/net/ethernet.h
-new file mode 100644
-index 0000000..450d519
--- /dev/null
+++ b/sysdeps/gnu/net/ethernet.h
@@ -0,0 +1,84 @@
@@ -176,9 +171,6 @@
+__END_DECLS
+
+#endif /* net/ethernet.h */
-diff --git a/sysdeps/gnu/net/if_arp.h b/sysdeps/gnu/net/if_arp.h
-new file mode 100644
-index 0000000..97cb61f
--- /dev/null
+++ b/sysdeps/gnu/net/if_arp.h
@@ -0,0 +1,184 @@
@@ -366,9 +358,6 @@
+__END_DECLS
+
+#endif /* net/if_arp.h */
-diff --git a/sysdeps/gnu/net/if_ether.h b/sysdeps/gnu/net/if_ether.h
-new file mode 100644
-index 0000000..4f33f3f
--- /dev/null
+++ b/sysdeps/gnu/net/if_ether.h
@@ -0,0 +1,116 @@
@@ -488,9 +477,6 @@
+} __attribute__((packed));
+
+#endif /* net/if_ether.h */
-diff --git a/sysdeps/gnu/net/if_ppp.h b/sysdeps/gnu/net/if_ppp.h
-new file mode 100644
-index 0000000..bf5ec83
--- /dev/null
+++ b/sysdeps/gnu/net/if_ppp.h
@@ -0,0 +1,169 @@
@@ -663,9 +649,6 @@
+__END_DECLS
+
+#endif /* net/if_ppp.h */
-diff --git a/sysdeps/gnu/net/route.h b/sysdeps/gnu/net/route.h
-new file mode 100644
-index 0000000..da5c810
--- /dev/null
+++ b/sysdeps/gnu/net/route.h
@@ -0,0 +1,145 @@
@@ -814,9 +797,6 @@
+#define RTMSG_AR_FAILED 0x51 /* Address Resolution failed. */
+
+#endif /* net/route.h */
-diff --git a/sysdeps/gnu/netinet/if_ether.h b/sysdeps/gnu/netinet/if_ether.h
-new file mode 100644
-index 0000000..47278a3
--- /dev/null
+++ b/sysdeps/gnu/netinet/if_ether.h
@@ -0,0 +1,104 @@
@@ -924,11 +904,9 @@
+#endif /* __USE_BSD */
+
+#endif /* netinet/if_ether.h */
-diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
-index 95d7ba3..7e6e86a 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
-@@ -206,11 +206,6 @@ ifeq ($(subdir),sunrpc)
+@@ -206,11 +206,6 @@
sysdep_headers += nfs/nfs.h
endif
@@ -940,9 +918,6 @@
ifeq ($(subdir),csu)
routines += unwind-resume
shared-only-routines += unwind-resume
-diff --git a/sysdeps/mach/hurd/net/ethernet.h b/sysdeps/mach/hurd/net/ethernet.h
-deleted file mode 100644
-index 2c524dc..0000000
--- a/sysdeps/mach/hurd/net/ethernet.h
+++ /dev/null
@@ -1,76 +0,0 @@
@@ -1022,9 +997,6 @@
-__END_DECLS
-
-#endif /* net/ethernet.h */
-diff --git a/sysdeps/mach/hurd/net/if_arp.h b/sysdeps/mach/hurd/net/if_arp.h
-deleted file mode 100644
-index c0153c9..0000000
--- a/sysdeps/mach/hurd/net/if_arp.h
+++ /dev/null
@@ -1,145 +0,0 @@
@@ -1173,9 +1145,6 @@
-__END_DECLS
-
-#endif /* net/if_arp.h */
-diff --git a/sysdeps/mach/hurd/net/if_ether.h b/sysdeps/mach/hurd/net/if_ether.h
-deleted file mode 100644
-index 36300cb..0000000
--- a/sysdeps/mach/hurd/net/if_ether.h
+++ /dev/null
@@ -1,85 +0,0 @@
@@ -1264,9 +1233,6 @@
-};
-
-#endif /* net/if_ether.h */
-diff --git a/sysdeps/mach/hurd/net/if_ppp.h b/sysdeps/mach/hurd/net/if_ppp.h
-deleted file mode 100644
-index bf5ec83..0000000
--- a/sysdeps/mach/hurd/net/if_ppp.h
+++ /dev/null
@@ -1,169 +0,0 @@
@@ -1439,9 +1405,6 @@
-__END_DECLS
-
-#endif /* net/if_ppp.h */
-diff --git a/sysdeps/mach/hurd/net/route.h b/sysdeps/mach/hurd/net/route.h
-deleted file mode 100644
-index 7b67461..0000000
--- a/sysdeps/mach/hurd/net/route.h
+++ /dev/null
@@ -1,141 +0,0 @@
@@ -1586,11 +1549,9 @@
-#define RTMSG_AR_FAILED 0x51 /* Address Resolution failed. */
-
-#endif /* net/route.h */
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index 91c123b..01ee1f8 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -101,8 +101,7 @@ sysdep_routines += ntp_gettime ntp_gettimex
+@@ -102,8 +102,7 @@
endif
ifeq ($(subdir),socket)
@@ -1600,9 +1561,6 @@
net/if_slip.h net/if_packet.h net/if_shaper.h
sysdep_routines += cmsg_nxthdr sa_len
endif
-diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h
-deleted file mode 100644
-index 0242d58..0000000
--- a/sysdeps/unix/sysv/linux/net/ethernet.h
+++ /dev/null
@@ -1,84 +0,0 @@
@@ -1690,9 +1648,6 @@
-__END_DECLS
-
-#endif /* net/ethernet.h */
-diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
-deleted file mode 100644
-index 97cb61f..0000000
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
+++ /dev/null
@@ -1,184 +0,0 @@
@@ -1880,9 +1835,6 @@
-__END_DECLS
-
-#endif /* net/if_arp.h */
-diff --git a/sysdeps/unix/sysv/linux/net/if_ether.h b/sysdeps/unix/sysv/linux/net/if_ether.h
-new file mode 100644
-index 0000000..e0fe7b5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/net/if_ether.h
@@ -0,0 +1,7 @@
@@ -1893,9 +1845,6 @@
+#include <linux/if_ether.h>
+
+#endif /* net/if_ether.h */
-diff --git a/sysdeps/unix/sysv/linux/net/if_ppp.h b/sysdeps/unix/sysv/linux/net/if_ppp.h
-deleted file mode 100644
-index bf5ec83..0000000
--- a/sysdeps/unix/sysv/linux/net/if_ppp.h
+++ /dev/null
@@ -1,169 +0,0 @@
@@ -2068,9 +2017,6 @@
-__END_DECLS
-
-#endif /* net/if_ppp.h */
-diff --git a/sysdeps/unix/sysv/linux/net/route.h b/sysdeps/unix/sysv/linux/net/route.h
-deleted file mode 100644
-index da5c810..0000000
--- a/sysdeps/unix/sysv/linux/net/route.h
+++ /dev/null
@@ -1,145 +0,0 @@
@@ -2219,9 +2165,6 @@
-#define RTMSG_AR_FAILED 0x51 /* Address Resolution failed. */
-
-#endif /* net/route.h */
-diff --git a/sysdeps/unix/sysv/linux/netinet/if_ether.h b/sysdeps/unix/sysv/linux/netinet/if_ether.h
-deleted file mode 100644
-index aadb59b..0000000
--- a/sysdeps/unix/sysv/linux/netinet/if_ether.h
+++ /dev/null
@@ -1,105 +0,0 @@
Reply to: