Processed: forcibly merging 816155 868076

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> forcemerge 816155 868076
Bug #816155 [libc6] Assertion failure in gethostbyname 
Bug #868076 [libc6] libc6: gethostbyname assertion failure on m68k
Changed Bug forwarded-to-address to 
'https://sourceware.org/bugzilla/show_bug.cgi?id=19741' from 
'https://sourceware.org/ml/libc-alpha/2017-07/msg00466.html'.
Marked as found in versions glibc/2.22-6 and glibc/2.21-9.
Bug #816155 [libc6] Assertion failure in gethostbyname 
Marked as found in versions glibc/2.24-12.
Added tag(s) upstream and patch.
Merged 816155 868076
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
816155: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816155
868076: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868076
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

[glibc] branch sid updated (2f27338 -> e34b7f8)

[Adam Conrad]

This is an automated email from the git hooks/post-receive script.

adconrad pushed a change to branch sid
in repository glibc.

  from  2f27338   debian/patches/arm/submitted-strip-bit-0.diff: Fix ld.so 
crash on armv7t.
   new  e34b7f8   Add a newline at the end of 
arm/submitted-strip-bit-0.diff to make quilt/patch happy.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/patches/arm/submitted-strip-bit-0.diff | 1 +
 1 file changed, 1 insertion(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/01: Add a newline at the end of arm/submitted-strip-bit-0.diff to make quilt/patch happy.

[Adam Conrad]

This is an automated email from the git hooks/post-receive script.

adconrad pushed a commit to branch sid
in repository glibc.

commit e34b7f84b7724673775907f89043c893f2417de5
Author: Adam Conrad 
Date:   Wed Jul 12 13:01:04 2017 -0600

Add a newline at the end of arm/submitted-strip-bit-0.diff to make 
quilt/patch happy.
---
 debian/patches/arm/submitted-strip-bit-0.diff | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/patches/arm/submitted-strip-bit-0.diff 
b/debian/patches/arm/submitted-strip-bit-0.diff
index 751da24..c3f7c59 100644
--- a/debian/patches/arm/submitted-strip-bit-0.diff
+++ b/debian/patches/arm/submitted-strip-bit-0.diff
@@ -28,3 +28,4 @@ index 
7053ead16ed0e7dac182660f7d88fa21f2b4799a..5b67e3d004818308d9bf93effb13d23a
 -  asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
return pcrel_addr - got_addr;
  }
+

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch sid updated (475f7a3 -> 2f27338)

[Adam Conrad]

This is an automated email from the git hooks/post-receive script.

adconrad pushed a change to branch sid
in repository glibc.

  from  475f7a3   debian/patches/arm/cvs-rtld-startup.diff: Fix ld.so 
segfault on arm64.
   new  2f27338   debian/patches/arm/submitted-strip-bit-0.diff: Fix ld.so 
crash on armv7t.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |  1 +
 debian/patches/arm/submitted-strip-bit-0.diff | 30 +++
 debian/patches/series |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 debian/patches/arm/submitted-strip-bit-0.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/01: debian/patches/arm/submitted-strip-bit-0.diff: Fix ld.so crash on armv7t.

[Adam Conrad]

This is an automated email from the git hooks/post-receive script.

adconrad pushed a commit to branch sid
in repository glibc.

commit 2f27338195604ab5bd75681d9a19202630238e2d
Author: Adam Conrad 
Date:   Wed Jul 12 12:53:48 2017 -0600

debian/patches/arm/submitted-strip-bit-0.diff: Fix ld.so crash on armv7t.
---
 debian/changelog  |  1 +
 debian/patches/arm/submitted-strip-bit-0.diff | 30 +++
 debian/patches/series |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2a19f6c..bdcf17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ glibc (2.24-13) UNRELEASED; urgency=medium
   [ Adam Conrad ]
   * debian/patches/any/cvs-common-symbols.diff: Fix build with newer binutils.
   * debian/patches/arm/cvs-rtld-startup.diff: Fix ld.so segfault on arm64.
+  * debian/patches/arm/submitted-strip-bit-0.diff: Fix ld.so crash on armv7t.
 
  -- Aurelien Jarno   Mon, 19 Jun 2017 17:36:36 +0200
 
diff --git a/debian/patches/arm/submitted-strip-bit-0.diff 
b/debian/patches/arm/submitted-strip-bit-0.diff
new file mode 100644
index 000..751da24
--- /dev/null
+++ b/debian/patches/arm/submitted-strip-bit-0.diff
@@ -0,0 +1,30 @@
+2017-07-12  Jiong Wang  
+
+* sysdeps/arm/dl-machine.h (elf_machine_load_address):  Also strip bit 0
+of pcrel_address under Thumb mode.
+
+diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
+index 
7053ead16ed0e7dac182660f7d88fa21f2b4799a..5b67e3d004818308d9bf93effb13d23a762e160f
 100644
+--- a/sysdeps/arm/dl-machine.h
 b/sysdeps/arm/dl-machine.h
+@@ -56,11 +56,19 @@ elf_machine_load_address (void)
+   extern Elf32_Addr internal_function __dl_start (void *) asm ("_dl_start");
+   Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
+   Elf32_Addr pcrel_addr;
++  asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
+ #ifdef __thumb__
+-  /* Clear the low bit of the funciton address.  */
++  /* Clear the low bit of the funciton address.
++
++ NOTE: got_addr is from GOT table whose lsb is always set by linker if 
it's
++ Thumb function address.  PCREL_ADDR comes from PC-relative calculation
++ which will finish during assembling.  GAS assembler before the fix for
++ PR gas/21458 was not setting the lsb but does after that.  Always do the
++ strip for both, so the code works with various combinations of glibc and
++ Binutils.  */
+   got_addr &= ~(Elf32_Addr) 1;
++  pcrel_addr &= ~(Elf32_Addr) 1;
+ #endif
+-  asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
+   return pcrel_addr - got_addr;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index b42af9a..7c91ab6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,6 +47,7 @@ arm/local-vfp-sysdeps.diff
 arm/unsubmitted-ldso-multilib.diff
 arm/local-arm-futex.diff
 arm/cvs-rtld-startup.diff
+arm/submitted-strip-bit-0.diff
 
 hppa/local-inlining.diff
 hppa/local-elf-make-cflags.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Bug#868153: glibc: FTBFS on x32: tst-getaddrinfo5 (tries to use the network), tst-robust8 (unknown)

[Thorsten Glaser]

On Wed, 12 Jul 2017, Thorsten Glaser wrote:

> An extra data point:
> 
> (pbuild18806-dpo)root@tglase:/tmp/buildd/glibc-2.24 # 
> ./build-tree/x32-libc/nptl/tst-robust8
> 
> This reproducibly (several times in a row) terminates after
> about one second with errorlevel 0 so I have no idea what
> in this test supposedly fails.

Ah, one out of ten did not, it terminated with:

Timed out: killed the child process

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg

Bug#868153: glibc: FTBFS on x32: tst-getaddrinfo5 (tries to use the network), tst-robust8 (unknown)

[Thorsten Glaser]

An extra data point:

(pbuild18806-dpo)root@tglase:/tmp/buildd/glibc-2.24 # 
./build-tree/x32-libc/nptl/tst-robust8

This reproducibly (several times in a row) terminates after
about one second with errorlevel 0 so I have no idea what
in this test supposedly fails.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg