← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to debian/patches/hurd-i386/tg-elfosabi_gnu.diff

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/hurd-i386/tg-elfosabi_gnu.diff
32
32
 
33
33
 sysdeps/mach/hurd/i386/init-first.c    |    3 -
34
34
 sysdeps/mach/hurd/ldsodefs.h           |   52 +++++++++++++++++++++++++++++++++
35
 
 sysdeps/mach/hurd/powerpc/init-first.c |    3 -
36
35
 sysdeps/unix/sysv/linux/ldsodefs.h     |    6 +--
37
36
 4 files changed, 55 insertions(+), 9 deletions(-)
38
37
 
103
102
+  }
104
103
+
105
104
+#endif /* ldsodefs.h */
106
 
--- a/sysdeps/mach/hurd/powerpc/init-first.c
107
 
+++ b/sysdeps/mach/hurd/powerpc/init-first.c
108
 
@@ -32,9 +32,6 @@
109
 
 #ifdef USE_NONOPTION_FLAGS
110
 
 extern void __getopt_clean_environment (char **);
111
 
 #endif
112
 
-#ifndef SHARED
113
 
-extern void _dl_non_dynamic_init (void) internal_function;
114
 
-#endif
115
 
 extern void __libc_global_ctors (void);
116
 
 
117
 
 unsigned int __hurd_threadvar_max;
118
105
--- a/sysdeps/unix/sysv/linux/ldsodefs.h
119
106
+++ b/sysdeps/unix/sysv/linux/ldsodefs.h
120
107
@@ -57,9 +57,9 @@