Fix incorrect references to #1975895 in %changelog

(cherry picked from commit b5165edc42d665c7770bea0e4378a526b0b24793)

README.quilt

@@ -1,34 +0,0 @@
-This package supports working with patch files using quilt.
-
-To regenerate the quilt series file run:
-./gen-quilt-series.sh
-
-Setup environment:
-export QUILT_PATCHES=$PWD
-
-Setup the source:
-./quilt-patch.sh [-f]
-
-Use `-f` if you want to have quilt-patch always remove the existing
-source directory before starting. Otherwise you'll be patching on top of
-an already patched tree generated perhaps by `*pkg prep`.
-
-Create a new patch:
-cd glibc-2.17-c758a686/
-quilt new glibc-rh1234622.patch
-quilt add ports/sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist
-vi ports/sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist
-quilt refresh
-cd ..
-git add glibc-rh1234622.patch
-<Then edit the glibc.spec file to build with the new patch>
-e.g.
-...
-PatchXXXX: glibc-rh1234622.patch
-...
-%patchXXXX -p1
-...
-git add glibc.spec
-git commit
-
-You're done!

SUPPORTED

@@ -92,6 +92,7 @@ ca_IT.UTF-8/UTF-8 \
 ca_IT/ISO-8859-15 \
 ce_RU/UTF-8 \
 chr_US/UTF-8 \
+ckb_IQ/UTF-8 \
 cmn_TW/UTF-8 \
 crh_UA/UTF-8 \
 cs_CZ.UTF-8/UTF-8 \
@@ -331,6 +332,7 @@ mk_MK/ISO-8859-5 \
 ml_IN/UTF-8 \
 mn_MN/UTF-8 \
 mni_IN/UTF-8 \
+mnw_MM/UTF-8 \
 mr_IN/UTF-8 \
 ms_MY.UTF-8/UTF-8 \
 ms_MY/ISO-8859-1 \

convnames.py

@@ -0,0 +1,18 @@
+#!/usr/bin/python3
+# This code is called by glibc.spec via lua to generate the mapping
+# from language code to language name.  The code uses langtable to
+# do the mapping.  The information in langtable is a harmonization
+# of CLDR and glibc lang_name data.
+import sys
+try:
+    import langtable
+except ImportError:
+    # if the import fails, don't translate anything
+    langtable = None
+
+for lang in sys.argv[1:]:
+    if langtable:
+        name = langtable.language_name(languageId=lang, languageIdQuery='en')
+        print(name or lang)
+    else:
+        print(lang)

glibc-deprecated-selinux-makedb.patch

@@ -0,0 +1,20 @@
+This is necessary to get things building again after libselinux changes.
+A proper fix is under discussion upstream:
+
+  <https://sourceware.org/pipermail/libc-alpha/2020-July/116504.html>
+
+diff --git a/nss/makedb.c b/nss/makedb.c
+index 8e389a1683747cf1..9d81aed57d384a22 100644
+--- a/nss/makedb.c
++++ b/nss/makedb.c
+@@ -17,6 +17,10 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
++/* This file uses deprecated declarations from libselinux.  */
++#include <libc-diag.h>
++DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
++
+ #include <argp.h>
+ #include <assert.h>
+ #include <ctype.h>

glibc-deprecated-selinux-nscd.patch

@@ -0,0 +1,17 @@
+This patch works around deprecated libselinux features used by nscd.
+
+diff --git a/nscd/selinux.c b/nscd/selinux.c
+index a4ea8008e201b939..0acca4639202a75a 100644
+--- a/nscd/selinux.c
++++ b/nscd/selinux.c
+@@ -17,6 +17,10 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
++/* This file uses deprecated declarations from libselinux.  */
++#include <libc-diag.h>
++DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
++
+ #include "config.h"
+ #include <error.h>
+ #include <errno.h>

glibc-fedora-__libc_multiple_libcs.patch

@@ -30,11 +30,11 @@ This patch needs to go upstream to get cleaned up, but has always involed
 analysis of the GNU/Hurd parts of the change and that stalled out, but
 perhaps with build-many-glibcs we can now test these changes more easily.
 
-Index: b/elf/dl-init.c
-===================================================================
+diff --git a/elf/dl-init.c b/elf/dl-init.c
+index 518824e8a5826314..66c395474a57c1fd 100644
 --- a/elf/dl-init.c
 +++ b/elf/dl-init.c
-@@ -119,8 +119,6 @@ _dl_init (struct link_map *main_map, int
+@@ -120,8 +120,6 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
    while (i-- > 0)
      call_init (main_map->l_initfini[i], argc, argv, env);
  
@@ -43,11 +43,11 @@ Index: b/elf/dl-init.c
    _dl_starting_up = 0;
 -#endif
  }
-Index: b/elf/dl-support.c
-===================================================================
+diff --git a/elf/dl-support.c b/elf/dl-support.c
+index 7704c101c5a543a1..ffa235c78df8481f 100644
 --- a/elf/dl-support.c
 +++ b/elf/dl-support.c
-@@ -117,10 +117,8 @@ struct r_scope_elem _dl_initial_searchli
+@@ -120,10 +120,8 @@ struct r_scope_elem _dl_initial_searchlist =
      .r_nlist = 1,
    };
  
@@ -58,19 +58,19 @@ Index: b/elf/dl-support.c
  
  /* Random data provided by the kernel.  */
  void *_dl_random;
-Index: b/elf/rtld.c
-===================================================================
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 5b882163fae5ea8a..f93adf017c9d2110 100644
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
-@@ -214,7 +214,6 @@ audit_list_iter_next (struct audit_list_
-   return iter->previous->name;
+@@ -316,7 +316,6 @@ audit_list_count (struct audit_list *list)
+   return naudit;
  }
  
 -#ifndef HAVE_INLINED_SYSCALLS
  /* Set nonzero during loading and initialization of executable and
     libraries, cleared before the executable's entry point runs.  This
     must not be initialized to nonzero, because the unused dynamic
-@@ -224,7 +223,6 @@ audit_list_iter_next (struct audit_list_
+@@ -326,7 +325,6 @@ audit_list_count (struct audit_list *list)
     never be called.  */
  int _dl_starting_up = 0;
  rtld_hidden_def (_dl_starting_up)
@@ -78,9 +78,9 @@ Index: b/elf/rtld.c
  
  /* This is the structure which defines all variables global to ld.so
     (except those which cannot be added for some reason).  */
-@@ -898,10 +896,8 @@ dl_main (const ElfW(Phdr) *phdr,
+@@ -1178,10 +1176,8 @@ dl_main (const ElfW(Phdr) *phdr,
    /* Process the environment variable which control the behaviour.  */
-   process_envvars (&mode);
+   process_envvars (&mode, &audit_list);
  
 -#ifndef HAVE_INLINED_SYSCALLS
    /* Set up a flag which tells we are just starting.  */

glibc-fedora-nsswitch.patch

@@ -3,7 +3,7 @@ version with minor downstream distribution modifications for
 use with SSSD and systemd.
 
 diff --git a/nss/nsswitch.conf b/nss/nsswitch.conf
-index f55358811495c9f1..14c3cde8080a848c 100644
+index 4a6bcb1f7bc0b1f4..980a68e32e6a04b8 100644
 --- a/nss/nsswitch.conf
 +++ b/nss/nsswitch.conf
 @@ -1,7 +1,7 @@
@@ -15,14 +15,14 @@ index f55358811495c9f1..14c3cde8080a848c 100644
  # sorted with the most-used services at the beginning.
  #
  # Valid databases are: aliases, ethers, group, gshadow, hosts,
-@@ -52,18 +52,20 @@
+@@ -52,19 +52,21 @@
  # shadow:    db files
  # group:     db files
  
 -# In alphabetical order. Re-order as required to optimize peformance.
 +# In order of likelihood of use to accelerate lookup.
 +passwd:     sss files
-+shadow:     files sss
++shadow:     files
 +group:      sss files
 +hosts:      files dns myhostname
 +services:   files sss
@@ -34,7 +34,8 @@ index f55358811495c9f1..14c3cde8080a848c 100644
 -group:      files
  gshadow:    files
 -hosts:      files dns
- initgroups: files
+ # Allow initgroups to default to the setting for group.
+ # initgroups: files
 -netgroup:   files
  networks:   files dns
 -passwd:     files

glibc-python3.patch

@@ -9,32 +9,22 @@ python3 during a transitional phase.
 Author: Carlos O'Donell <carlos@redhat.com>
 
 diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py
-index c1c438a1c9f0eae6..b7d3d7bcee87969d 100755
+index a215ebc9bd92ba73..f174161ed3147e03 100755
 --- a/benchtests/scripts/compare_bench.py
 +++ b/benchtests/scripts/compare_bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
- # Copyright (C) 2015-2019 Free Software Foundation, Inc.
+ # Copyright (C) 2015-2020 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  #
 diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py
-index 7a55d19f038e64d4..72e6034243a8c9b6 100644
+index 08681aafdc200f64..2264da00370f9f02 100644
 --- a/benchtests/scripts/import_bench.py
 +++ b/benchtests/scripts/import_bench.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
- # Copyright (C) 2015-2019 Free Software Foundation, Inc.
- # This file is part of the GNU C Library.
- #
-diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
-index 55d07c6bce5b5184..04129f9c26c2874c 100755
---- a/benchtests/scripts/validate_benchout.py
-+++ b/benchtests/scripts/validate_benchout.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # Copyright (C) 2014-2019 Free Software Foundation, Inc.
+ # Copyright (C) 2015-2020 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  #

glibc-rh1615608.patch

@@ -1,22 +0,0 @@
-Please see the following bug for a complete summary:
-https://bugzilla.redhat.com/show_bug.cgi?id=1615608
-
-Index: glibc-2.28/manual/startup.texi
-===================================================================
---- glibc-2.28.orig/manual/startup.texi
-+++ glibc-2.28/manual/startup.texi
-@@ -1005,14 +1005,6 @@ This function actually terminates the pr
- intercept this signal; see @ref{Signal Handling}.
- @end deftypefun
- 
--@c Put in by rms.  Don't remove.
--@cartouche
--@strong{Future Change Warning:} Proposed Federal censorship regulations
--may prohibit us from giving you information about the possibility of
--calling this function.  We would be required to say that this is not an
--acceptable way of terminating a program.
--@end cartouche
--
- @node Termination Internals
- @subsection Termination Internals
- 

glibc-rh741105.patch

@@ -9,21 +9,47 @@ file. This is the wrong fix for this problem and should be dropped.
 The correct solution is to mark debuginfo files as new types of
 ELF files.
 
-Index: glibc-2.22-386-g95e8397/elf/dl-load.c
-===================================================================
---- glibc-2.22-386-g95e8397.orig/elf/dl-load.c
-+++ glibc-2.22-386-g95e8397/elf/dl-load.c
-@@ -881,7 +881,8 @@ _dl_map_object_from_fd (const char *name
- 
-   /* Get file information.  */
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 24e2819345995bd9..007121144e71d9cf 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -880,6 +880,18 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
+      in this information for the executable in case of an explicit
+      loader invocation.  */
    struct r_file_id id;
--  if (__glibc_unlikely (!_dl_get_file_id (fd, &id)))
 +  struct stat64 st;
++
 +  if (__glibc_unlikely (!_dl_get_file_id (fd, &id, &st)))
++    {
++      errstring = N_("cannot stat shared object");
++      call_lose_errno:
++        errval = errno;
++      call_lose:
++        lose (errval, fd, name, realname, l, errstring,
++              make_consistent ? r : NULL, nsid);
++    }
++
+   if (mode & __RTLD_OPENEXEC)
      {
-       errstring = N_("cannot stat shared object");
-     call_lose_errno:
-@@ -1076,6 +1077,16 @@ _dl_map_object_from_fd (const char *name
+       assert (nsid == LM_ID_BASE);
+@@ -887,16 +899,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
+     }
+   else
+     {
+-      if (__glibc_unlikely (!_dl_get_file_id (fd, &id)))
+-	{
+-	  errstring = N_("cannot stat shared object");
+-	call_lose_errno:
+-	  errval = errno;
+-	call_lose:
+-	  lose (errval, fd, name, realname, l, errstring,
+-		make_consistent ? r : NULL, nsid);
+-	}
+-
+       /* Look again to see if the real name matched another already loaded.  */
+       for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next)
+ 	if (!l->l_removed && _dl_file_id_match_p (&l->l_file_id, &id))
+@@ -1074,6 +1076,16 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
  		= N_("ELF load command address/offset not properly aligned");
  	      goto call_lose;
  	    }
@@ -40,10 +66,10 @@ Index: glibc-2.22-386-g95e8397/elf/dl-load.c
  
  	  struct loadcmd *c = &loadcmds[nloadcmds++];
  	  c->mapstart = ALIGN_DOWN (ph->p_vaddr, GLRO(dl_pagesize));
-Index: glibc-2.22-386-g95e8397/sysdeps/generic/dl-fileid.h
-===================================================================
---- glibc-2.22-386-g95e8397.orig/sysdeps/generic/dl-fileid.h
-+++ glibc-2.22-386-g95e8397/sysdeps/generic/dl-fileid.h
+diff --git a/sysdeps/generic/dl-fileid.h b/sysdeps/generic/dl-fileid.h
+index 6310d46c2a6efc60..209580b6c0b8524b 100644
+--- a/sysdeps/generic/dl-fileid.h
++++ b/sysdeps/generic/dl-fileid.h
 @@ -29,7 +29,8 @@ struct r_file_id
     On error, returns false, with errno set.  */
  static inline bool
@@ -54,10 +80,10 @@ Index: glibc-2.22-386-g95e8397/sysdeps/generic/dl-fileid.h
  {
    return true;
  }
-Index: glibc-2.22-386-g95e8397/sysdeps/posix/dl-fileid.h
-===================================================================
---- glibc-2.22-386-g95e8397.orig/sysdeps/posix/dl-fileid.h
-+++ glibc-2.22-386-g95e8397/sysdeps/posix/dl-fileid.h
+diff --git a/sysdeps/posix/dl-fileid.h b/sysdeps/posix/dl-fileid.h
+index ae88a350788a5999..baa17b90a292a4d9 100644
+--- a/sysdeps/posix/dl-fileid.h
++++ b/sysdeps/posix/dl-fileid.h
 @@ -27,18 +27,16 @@ struct r_file_id
      ino64_t ino;
    };

power6emul.c

@@ -1,273 +0,0 @@
-/* Emulate power6 mf[tf]gpr and fri[zpmn] instructions.
-   Copyright (C) 2006 Red Hat, Inc.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2006.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   It is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <signal.h>
-#include <stdio.h>
-
-extern double frip (double), friz (double), frin (double), frim (double);
-asm (".globl frip, friz, frin, frim\n.hidden frip, friz, frin, frim\n\t"
-#ifdef __powerpc64__
-	".section \".toc\",\"aw\"\n"
-"8:"	".tc FD_43300000_0[TC],0x4330000000000000\n"
-"9:"	".tc FD_3fe00000_0[TC],0x3fe0000000000000\n\t"
-	".previous\n\t"
-#else
-	".rodata\n\t"
-	".align 2\n"
-"8:"	".long 0x59800000\n"
-"9:"	".long 0x3f000000\n\t"
-	".previous\n\t"
-#endif
-	"# frip == ceil\n"
-"frip:"	"mffs    11\n\t"
-#ifdef __powerpc64__
-	"lfd     13,8b@toc(2)\n\t"
-#else
-	"mflr    11\n\t"
-	"bcl     20,31,1f\n"
-"1:"	"mflr    9\n\t"
-	"addis   9,9,8b-1b@ha\n\t"
-	"lfs     13,8b-1b@l(9)\n\t"
-	"mtlr    11\n\t"
-#endif
-	"fabs    0,1\n\t"
-	"fsub    12,13,13\n\t"
-	"fcmpu   7,0,13\n\t"
-	"fcmpu   6,1,12\n\t"
-	"bnllr-  7\n\t"
-	"mtfsfi  7,2\n\t"
-	"ble-    6,2f\n\t"
-	"fadd    1,1,13\n\t"
-	"fsub    1,1,13\n\t"
-	"fabs    1,1\n\t"
-	"mtfsf   0x01,11\n\t"
-	"blr\n"
-"2:"	"bge-    6,3f\n\t"
-	"fsub    1,1,13\n\t"
-	"fadd    1,1,13\n\t"
-	"fnabs   1,1\n"
-"3:"	"mtfsf   0x01,11\n\t"
-	"blr\n\t"
-	"# friz == trunc\n"
-"friz:"	"mffs    11\n\t"
-#ifdef __powerpc64__
-	"lfd     13,8b@toc(2)\n\t"
-#else
-	"mflr    11\n\t"
-	"bcl     20,31,1f\n"
-"1:"	"mflr    9\n\t"
-	"addis   9,9,8b-1b@ha\n\t"
-	"lfs     13,8b-1b@l(9)\n\t"
-	"mtlr    11\n\t"
-#endif
-	"fabs    0,1\n\t"
-	"fsub    12,13,13\n\t"
-	"fcmpu   7,0,13\n\t"
-	"fcmpu   6,1,12\n\t"
-	"bnllr-  7\n\t"
-	"mtfsfi  7,1\n\t"
-	"ble-    6,2f\n\t"
-	"fadd    1,1,13\n\t"
-	"fsub    1,1,13\n\t"
-	"fabs    1,1\n\t"
-	"mtfsf   0x01,11\n\t"
-	"blr\n"
-"2:"	"bge-    6,3f\n\t"
-	"fsub    1,1,13\n\t"
-	"fadd    1,1,13\n\t"
-	"fnabs   1,1\n"
-"3:"	"mtfsf   0x01,11\n\t"
-	"blr\n\t"
-	"# frin == round\n"
-"frin:"	"mffs    11\n\t"
-#ifdef __powerpc64__
-	"lfd     13,8b@toc(2)\n\t"
-#else
-	"mflr    11\n\t"
-	"bcl     20,31,1f\n"
-"1:"	"mflr    9\n\t"
-	"addis   9,9,8b-1b@ha\n\t"
-	"addi    9,9,8b-1b@l\n\t"
-	"mtlr    11\n\t"
-	"lfs     13,0(9)\n\t"
-#endif
-	"fabs    0,1\n\t"
-	"fsub    12,13,13\n\t"
-	"fcmpu   7,0,13\n\t"
-	"fcmpu   6,1,12\n\t"
-	"bnllr-  7\n\t"
-	"mtfsfi  7,1\n\t"
-#ifdef __powerpc64__
-	"lfd     10,9b@toc(2)\n\t"
-#else
-	"lfs     10,9b-8b(9)\n\t"
-#endif
-	"ble-    6,2f\n\t"
-	"fadd    1,1,10\n\t"
-	"fadd    1,1,13\n\t"
-	"fsub    1,1,13\n\t"
-	"fabs    1,1\n\t"
-	"mtfsf   0x01,11\n\t"
-	"blr\n"
-"2:"	"fsub    9,1,10\n\t"
-	"bge-    6,3f\n\t"
-	"fsub    1,9,13\n\t"
-	"fadd    1,1,13\n\t"
-	"fnabs   1,1\n"
-"3:"	"mtfsf   0x01,11\n\t"
-	"blr\n\t"
-	"# frim == floor\n"
-"frim:"	"mffs    11\n\t"
-#ifdef __powerpc64__
-	"lfd     13,8b@toc(2)\n\t"
-#else
-	"mflr    11\n\t"
-	"bcl     20,31,1f\n"
-"1:"	"mflr    9\n\t"
-	"addis   9,9,8b-1b@ha\n\t"
-	"lfs     13,8b-1b@l(9)\n\t"
-	"mtlr    11\n\t"
-#endif
-	"fabs    0,1\n\t"
-	"fsub    12,13,13\n\t"
-	"fcmpu   7,0,13\n\t"
-	"fcmpu   6,1,12\n\t"
-	"bnllr-  7\n\t"
-	"mtfsfi  7,3\n\t"
-	"ble-    6,2f\n\t"
-	"fadd    1,1,13\n\t"
-	"fsub    1,1,13\n\t"
-	"fabs    1,1\n\t"
-	"mtfsf   0x01,11\n\t"
-	"blr\n"
-"2:"	"bge-    6,3f\n\t"
-	"fsub    1,1,13\n\t"
-	"fadd    1,1,13\n\t"
-	"fnabs   1,1\n"
-"3:"	"mtfsf   0x01,11\n\t"
-	"blr\n");
-
-#ifdef __powerpc64__
-#define m1 0x5555555555555555L
-#define m2 0x3333333333333333L
-#define m3 0x0f0f0f0f0f0f0f0fL
-#else
-#define m1 0x55555555
-#define m2 0x33333333
-#define m3 0x0f0f0f0f
-#endif
-
-static inline unsigned long
-popcntb (unsigned long n)
-{
-  n -= (n >> 1) & m1;
-  n = (n & m2) + ((n >> 2) & m2);
-  n = (n + (n >> 4)) & m3;
-  return n;
-}
-
-static void
-catch_sigill (int signal, struct sigcontext *ctx)
-{
-  unsigned int insn = *(unsigned int *) (ctx->regs->nip);
-#ifdef __powerpc64__
-  if ((insn & 0xfc1f07ff) == 0x7c0005be) /* mftgpr */
-    {
-      unsigned long *regs = (unsigned long *) ctx->regs;
-      unsigned fpr = (insn >> 11) & 0x1f;
-      unsigned gpr = (insn >> 21) & 0x1f;
-      regs[gpr] = regs[fpr + 0x30];
-      ctx->regs->nip += 4;
-      return;
-    }
-  if ((insn & 0xfc1f07ff) == 0x7c0004be) /*mffgpr */
-    {
-      unsigned long *regs = (unsigned long *) ctx->regs;
-      unsigned fpr = (insn >> 21) & 0x1f;
-      unsigned gpr = (insn >> 11) & 0x1f;
-      regs[fpr + 0x30] = regs[gpr];
-      ctx->regs->nip += 4;
-      return;
-    }
-#endif
-  if ((insn & 0xfc1f073f) == 0xfc000310) /* fri[pznm] */
-    {
-#ifdef __powerpc64__
-      double *regs = (double *) (((char *) ctx->regs) + 0x30 * 8);
-      unsigned int *fpscr = (unsigned int *) (((char *) ctx->regs) + 0x50 * 8 + 4);
-#else
-      double *regs = (double *) (((char *) ctx->regs) + 0x30 * 4);
-      unsigned int *fpscr = (unsigned int *) (((char *) ctx->regs) + 0x30 * 4 + 0x20 * 8 + 4);
-#endif
-      unsigned dest = (insn >> 21) & 0x1f;
-      unsigned src = (insn >> 11) & 0x1f;
-      switch (insn & 0xc0)
-	{
-	case 0:
-	  regs[dest] = frin (regs[src]);
-	  break;
-	case 0x40:
-	  regs[dest] = friz (regs[src]);
-	  break;
-	case 0x80:
-	  regs[dest] = frip (regs[src]);
-	  break;
-	case 0xc0:
-	  regs[dest] = frim (regs[src]);
-	  break;
-	}
-      /* Update raised exceptions.  */
-      union { unsigned int i[2]; double d; } u;
-      asm volatile ("mffs %0" : "=f" (u.d));
-      u.i[1] &= 0xfffe0000; /* Is this correct?  */
-      *fpscr |= u.i[1];
-      ctx->regs->nip += 4;
-      return;
-    }
-  if ((insn & 0xfc00ffff) == 0x7c0000f4) /* popcntb */
-    {
-      unsigned long *regs = (unsigned long *) ctx->regs;
-      unsigned dest = (insn >> 16) & 0x1f;
-      unsigned src = (insn >> 21) & 0x1f;
-      unsigned long res = 0;
-      int i;
-
-      regs[dest] = popcntb (regs[src]);
-      ctx->regs->nip += 4;
-      return;
-    }
-
-  struct sigaction sa;
-  sa.sa_handler = SIG_DFL;
-  sigemptyset (&sa.sa_mask);
-  sa.sa_flags = 0;
-  sigaction (signal, &sa, NULL);
-  raise (signal);
-}
-
-static void
-__attribute__ ((constructor))
-install_handler (void)
-{
-  struct sigaction sa;
-  sa.sa_handler = (void *) catch_sigill;
-  sigemptyset (&sa.sa_mask);
-  sa.sa_flags = SA_RESTART;
-  sigaction (SIGILL, &sa, NULL);
-}

quilt-patch.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# Patches are in the current directory.
-export QUILT_PATCHES=$PWD
-# Extract source file name from sources file,
-# and assume it's the same name as the directory.
-source=`awk -F '[() ]+'  '/^[A-Z0-9]+ /{print $2}; /^[0-9a-f]+ /{print $2}' sources`
-srcdir=${source%.tar.xz}
-if [ "$1" == "-f" ] && [ -d "$srcdir" ]; then
-    echo Cleaning up $srcdir
-    rm -rf $srcdir
-fi
-if [ -d "$srcdir" ]; then
-    # Don't overwrite existing source directory.
-    echo "ERROR: Source directory $srcdir already exists. Use -f to force cleanup step."
-    exit 1
-fi
-tar Jxvf $source
-echo "Entering $srcdir"
-pushd $srcdir
-# Apply all patches.
-quilt push -a
-popd

sources

@@ -1 +1 @@
-SHA512 (glibc-2.30.9000-100-g1a6566094d.tar.xz) = e6054a8f1367fde262f023c76f7eaf5ce588613c4894b8d577c7e1c3159a2dfcefb7c60e301340b823cd8e6d2f8d264d7da83e61034b9180836d392d5db4c5ba
+SHA512 (glibc-2.32-49-g27e892f660.tar.xz) = 836f7c7e2a2a5dcd2d21d770e7af1aabb759a604357d49ac74f8d02dd7d27304ba4778f316d09642f45fe2249c84ad433aef8600b93dba664fca237150654bf1

wrap-find-debuginfo.sh

@@ -0,0 +1,159 @@
+#!/bin/bash
+# Wrapper script for find-debuginfo.sh
+#
+# Usage:
+#  wrap-find-debuginfo.sh SYSROOT-PATH SCRIPT-PATH SCRIPT-ARGS...
+#
+# The wrapper saves the original version of ld.so found in SYSROOT-PATH,
+# invokes SCRIPT-PATH with SCRIPT-ARGS, and then restores the
+# LDSO-PATH file, followed by note merging and DWZ compression.
+# As a result, ld.so has (mostly) unchanged debuginfo even
+# after debuginfo extraction.
+#
+# For libc.so.6 and other shared objects, a set of strategic symbols
+# is preserved in .symtab that are frequently used in valgrind
+# suppressions and elsewhere.
+
+set -ex
+
+ldso_tmp="$(mktemp)"
+libc_tmp="$(mktemp)"
+libdl_tmp="$(mktemp)"
+libpthread_tmp="$(mktemp)"
+librt_tmp="$(mktemp)"
+
+# Prefer a separately installed debugedit over the RPM-integrated one.
+if command -v debugedit >/dev/null ; then
+    debugedit=debugedit
+else
+    debugedit=/usr/lib/rpm/debugedit
+fi
+
+cleanup () {
+    rm -f "$ldso_tmp" "$libc_tmp" "$libdl_tmp" "$libpthread_tmp" "$librt_tmp"
+}
+trap cleanup 0
+
+sysroot_path="$1"
+shift
+script_path="$1"
+shift
+
+# See run_ldso setting in glibc.spec.
+ldso_path=
+for ldso_candidate in `find "$sysroot_path" -name 'ld-*.so' -type f` ; do
+    if test -z "$ldso_path" ; then
+	ldso_path="$ldso_candidate"
+    else
+	echo "error: multiple ld.so candidates: $ldso_path, $ldso_candidate"
+	exit 1
+    fi
+done
+
+libc_path=
+for libc_candidate in `find "$sysroot_path" -name 'libc-*.so' -type f` ; do
+    if test -z "$libc_path" ; then
+	libc_path="$libc_candidate"
+    else
+	echo "error: multiple libc.so.6 candidates: $libc_path, $libc_candidate"
+	exit 1
+    fi
+done
+
+libdl_path=
+for libdl_candidate in `find "$sysroot_path" -name 'libdl-*.so' -type f` ; do
+    if test -z "$libdl_path" ; then
+	libdl_path="$libdl_candidate"
+    else
+	echo "error: multiple libdl.so.6 candidates: $libdl_path, $libdl_candidate"
+	exit 1
+    fi
+done
+
+libpthread_path=
+for libpthread_candidate in `find "$sysroot_path" -name 'libpthread-*.so' -type f` ; do
+    if test -z "$libpthread_path" ; then
+	libpthread_path="$libpthread_candidate"
+    else
+	echo "error: multiple libpthread.so.6 candidates: $libpthread_path, $libpthread_candidate"
+	exit 1
+    fi
+done
+
+librt_path=
+for librt_candidate in `find "$sysroot_path" -name 'librt-*.so' -type f` ; do
+    if test -z "$librt_path" ; then
+	librt_path="$librt_candidate"
+    else
+	echo "error: multiple librt.so.6 candidates: $librt_path, $librt_candidate"
+	exit 1
+    fi
+done
+
+# Preserve the original files.
+cp "$ldso_path" "$ldso_tmp"
+cp "$libc_path" "$libc_tmp"
+cp "$libdl_path" "$libdl_tmp"
+cp "$libpthread_path" "$libpthread_tmp"
+cp "$librt_path" "$librt_tmp"
+
+# Run the debuginfo extraction.
+"$script_path" "$@"
+
+# Restore the original files.
+cp "$ldso_tmp" "$ldso_path"
+cp "$libc_tmp" "$libc_path"
+cp "$libdl_tmp" "$libdl_path"
+cp "$libpthread_tmp" "$libpthread_path"
+cp "$librt_tmp" "$librt_path"
+
+# Reduce the size of notes.  Primarily for annobin.
+objcopy --merge-notes "$ldso_path"
+objcopy --merge-notes "$libc_path"
+objcopy --merge-notes "$libdl_path"
+objcopy --merge-notes "$libpthread_path"
+objcopy --merge-notes "$librt_path"
+
+# libc.so.6 and other shared objects: Reduce to valuable symbols.
+# Eliminate file symbols, annobin symbols, and symbols used by the
+# glibc build to implement hidden aliases (__EI_*).  We would also
+# like to remove __GI_* symbols, but even listing them explicitly (as
+# in -K __GI_strlen) still causes strip to remove them, so there is no
+# filtering of __GI_* here.  (Debuginfo is gone after this, so no need
+# to optimize it.)
+for p in "$libc_path" "$libdl_path" "$libpthread_path" "$librt_path"; do
+    strip -w \
+	  -K '*' \
+	  -K '!*.c' \
+	  -K '!*.os' \
+	  -K '!.annobin_*' \
+	  -K '!__EI_*' \
+	  -K '!__PRETTY_FUNCTION__*' \
+	  "$p"
+done
+
+# ld.so: Rewrite the source file paths to match the extracted
+# locations.  First compute the arguments for invoking debugedit.
+# See find-debuginfo.sh.
+debug_dest_name="/usr/src/debug"
+last_arg=
+while true ; do
+    arg="$1"
+    shift || break
+    case "$arg" in
+	(--unique-debug-src-base)
+	    debug_dest_name="/usr/src/debug/$1"
+	    shift
+	    ;;
+	(-*)
+	    ;;
+	(*)
+	    last_arg="$arg"
+	    ;;
+    esac
+done
+debug_base_name=${last_arg:-$RPM_BUILD_ROOT}
+$debugedit -b "$debug_base_name" -d "$debug_dest_name" -n $ldso_path
+
+# Apply single-file DWARF optimization.
+dwz $ldso_path