@@ -3,7 +3,7 @@

 Summary:        Contains the GNU compiler collection

 Name:           gcc

 Version:        7.3.0

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        GPLv2+

 URL:            http://gcc.gnu.org

 Group:          Development/Tools

@@ -14,6 +14,8 @@ Source0:        http://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version}

 Patch0:         PLUGIN_TYPE_CAST.patch

 Patch1:         libsanitizer-avoidustat.h-glibc-2.28.patch

 Patch2:         090_all_pr55930-dependency-tracking.patch

+Patch3:         glibc-2.31-libsanitizer-1.patch

+Patch4:         glibc-2.31-libsanitizer-2.patch

 Requires:       libstdc++-devel = %{version}-%{release}

 Requires:       libgcc-devel = %{version}-%{release}

 Requires:       libgomp-devel = %{version}-%{release}

@@ -89,6 +91,8 @@ This package contains development headers and static library for libgomp

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

+%patch3 -p1

+%patch4 -p1

 # disable no-pie for gcc binaries

 sed -i '/^NO_PIE_CFLAGS = /s/@NO_PIE_CFLAGS@//' gcc/Makefile.in

@@ -208,6 +212,8 @@ make %{?_smp_mflags} check-gcc

 %{_lib64dir}/libgomp.spec

 %changelog

+*   Tue Mar 24 2020 Alexey Makhalov <amakhalov@vmware.com> 7.3.0-6

+-   Fix compilation issue with glibc-2.31

 *   Tue Nov 06 2018 Alexey Makhalov <amakhalov@vmware.com> 7.3.0-5

 -   Cross compilation support

 *   Fri Nov 02 2018 Alexey Makhalov <amakhalov@vmware.com> 7.3.0-4

new file mode 100644

@@ -0,0 +1,36 @@

+From ce9568e9e9cf6094be30e748821421e703754ffc Mon Sep 17 00:00:00 2001

+From: Jakub Jelinek <jakub@redhat.com>

+Date: Fri, 8 Nov 2019 19:53:18 +0100

+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm

+ bootstrap due to libsanitizer)

+

+	Backported from mainline

+	2019-10-22  Tamar Christina  <tamar.christina@arm.com>

+

+	PR sanitizer/92154

+	* sanitizer_common/sanitizer_platform_limits_posix.cc:

+	Cherry-pick compiler-rt revision r375220.

+

+From-SVN: r277981

+---

+ .../sanitizer_common/sanitizer_platform_limits_posix.cc  | 6 +++++-

+ 1 files changed, 5 insertions(+), 1 deletion(-)

+

+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

+index 6cd4a5bac8b0..06a605ff4670 100644

+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

+@@ -1156,8 +1156,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);

+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)

++#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \

++    !defined(__arm__)

+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */

++/* On Arm glibc 2.31 and later provide a different mode field, this field is

++   never used by libsanitizer so we can simply ignore this assert for all glibc

++   versions.  */

+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);

+ #endif

+ 

new file mode 100644

@@ -0,0 +1,72 @@

+From 75003cdd23c310ec385344e8040d490e8dd6d2be Mon Sep 17 00:00:00 2001

+From: Jakub Jelinek <jakub@redhat.com>

+Date: Fri, 20 Dec 2019 17:58:35 +0100

+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm

+ bootstrap due to libsanitizer)

+

+	Backported from mainline

+	2019-11-26  Jakub Jelinek  <jakub@redhat.com>

+

+	PR sanitizer/92154

+	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick

+	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.

+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.

+

+From-SVN: r279653

+---

+ .../sanitizer_platform_limits_posix.cc            |  9 +++------

+ .../sanitizer_platform_limits_posix.h             | 15 +--------------

+ 2 files changed, 4 insertions(+), 20 deletions(-)

+

+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

+index 06a605ff4670..d823a12190c0 100644

+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

+@@ -1156,12 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);

+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);

+-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \

+-    !defined(__arm__)

+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */

+-/* On Arm glibc 2.31 and later provide a different mode field, this field is

+-   never used by libsanitizer so we can simply ignore this assert for all glibc

+-   versions.  */

++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)

++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit

++   on many architectures.  */

+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);

+ #endif

+ 

+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

+index 73af92af1e8f..6a673a7c9959 100644

+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

+@@ -211,26 +211,13 @@ namespace __sanitizer {

+     u64 __unused1;

+     u64 __unused2;

+-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)

+-    unsigned int mode;

+-    unsigned short __seq;

+-    unsigned short __pad1;

+-    unsigned long __unused1;

+-    unsigned long __unused2;

+ #elif defined(__sparc__)

+-# if defined(__arch64__)

+     unsigned mode;

+-    unsigned short __pad1;

+-# else

+-    unsigned short __pad1;

+-    unsigned short mode;

+     unsigned short __pad2;

+-# endif

+     unsigned short __seq;

+     unsigned long long __unused1;

+     unsigned long long __unused2;

+ #else

+-    unsigned short mode;

+-    unsigned short __pad1;

++    unsigned int mode;

+     unsigned short __seq;

+     unsigned short __pad2;

+ #if defined(__x86_64__) && !defined(_LP64)

@@ -218,16 +218,16 @@ index 54e406b..29787a5 100644

 +}

 +

  #if USE_TCACHE

- static inline int

- __always_inline

+ static __always_inline int

+ do_set_tcache_max (size_t value)

 @@ -5237,6 +5263,11 @@ __libc_mallopt (int param_number, int value)

        if (value > 0)

- 	do_set_arena_max (value);

+ 	res = do_set_arena_max (value);

        break;

 +

 +    case M_ARENA_STICKINESS:

 +      if (value > 0)

-+	do_set_arena_stickiness (value);

++	res = do_set_arena_stickiness (value);

 +      break;

      }

    __libc_lock_unlock (av->mutex);

deleted file mode 100644

@@ -1,33 +0,0 @@

-From 583dd860d5b833037175247230a328f0050dbfe9 Mon Sep 17 00:00:00 2001

-From: Paul Eggert <eggert@cs.ucla.edu>

-Date: Mon, 21 Jan 2019 11:08:13 -0800

-Subject: [PATCH] regex: fix read overrun [BZ #24114]

-

-Problem found by AddressSanitizer, reported by Hongxu Chen in:

-https://debbugs.gnu.org/34140

-* posix/regexec.c (proceed_next_node):

-Do not read past end of input buffer.

- posix/regexec.c |  6 ++++--

- 1 file changed, 3 insertions(+), 3 deletions(-)

-

-diff --git a/posix/regexec.c b/posix/regexec.c

-index 91d5a79..084b122 100644

-+++ b/posix/regexec.c

-@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,

- 	      else if (naccepted)

- 		{

- 		  char *buf = (char *) re_string_get_buffer (&mctx->input);

--		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,

--			      naccepted) != 0)

-+		  if (mctx->input.valid_len - *pidx < naccepted

-+		      || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,

-+				  naccepted)

-+			  != 0))

- 		    return -1;

- 		}

- 	    }

-2.9.3

-

deleted file mode 100644

@@ -1,72 +0,0 @@

-Submitted By:            Armin K. <krejzi at email dot com>

-Date:                    2013-02-11

-Initial Package Version: 2.17

-Upstream Status:         Not Applicable

-Origin:                  Self

-Description:             This patch removes references to /var/db directory which is not part

-                         of FHS and replaces them with more suitable directories in /var

-                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.

-

-+++ b/Makeconfig	2013-02-11 01:32:32.500667439 +0100

-@@ -250,7 +250,7 @@

- 

- # Directory for the database files and Makefile for nss_db.

- ifndef vardbdir

--vardbdir = $(localstatedir)/db

-+vardbdir = $(localstatedir)/lib/nss_db

- endif

- inst_vardbdir = $(install_root)$(vardbdir)

- 

-+++ b/nscd/nscd.h	2013-02-11 01:32:32.500667439 +0100

-@@ -112,11 +112,11 @@

- 

- 

- /* Paths of the file for the persistent storage.  */

--#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"

--#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"

--#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"

--#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"

--#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"

-+#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"

-+#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"

-+#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"

-+#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"

-+#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"

- 

- /* Path used when not using persistent storage.  */

- #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"

-+++ b/nss/db-Makefile	2013-02-11 01:32:32.500667439 +0100

-@@ -22,7 +22,7 @@

- 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \

- 		       /etc/netgroup)

- 

--VAR_DB = /var/db

-+VAR_DB = /var/lib/nss_db

- 

- AWK = awk

- MAKEDB = makedb --quiet

-+++ b/sysdeps/generic/paths.h	2013-02-11 01:32:32.500667439 +0100

-@@ -68,7 +68,7 @@

- /* Provide trailing slash, since mostly used for building pathnames. */

- #define	_PATH_DEV	"/dev/"

- #define	_PATH_TMP	"/tmp/"

--#define	_PATH_VARDB	"/var/db/"

-+#define	_PATH_VARDB	"/var/lib/nss_db/"

- #define	_PATH_VARRUN	"/var/run/"

- #define	_PATH_VARTMP	"/var/tmp/"

- 

-+++ b/sysdeps/unix/sysv/linux/paths.h	2013-02-11 01:32:32.504000831 +0100

-@@ -68,7 +68,7 @@

- /* Provide trailing slash, since mostly used for building pathnames. */

- #define	_PATH_DEV	"/dev/"

- #define	_PATH_TMP	"/tmp/"

--#define	_PATH_VARDB	"/var/db/"

-+#define	_PATH_VARDB	"/var/lib/nss_db/"

- #define	_PATH_VARRUN	"/var/run/"

- #define	_PATH_VARTMP	"/var/tmp/"

- 

deleted file mode 100644

@@ -1,37 +0,0 @@

-From: Florian Weimer <fweimer@redhat.com>

-Date: Tue, 27 Nov 2018 15:12:43 +0000 (+0100)

-Subject: CVE-2018-19591: if_nametoindex: Fix descriptor for overlong name [BZ #23927]

-X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff_plain;h=d527c860f5a3f0ed687bd03f0cb464612dc23408

-

-CVE-2018-19591: if_nametoindex: Fix descriptor for overlong name [BZ #23927]

-

-diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c

-index e3d0898..782fc5e 100644

-+++ b/sysdeps/unix/sysv/linux/if_index.c

-@@ -38,11 +38,6 @@ __if_nametoindex (const char *ifname)

-   return 0;

- #else

-   struct ifreq ifr;

--  int fd = __opensock ();

--

--  if (fd < 0)

--    return 0;

--

-   if (strlen (ifname) >= IFNAMSIZ)

-     {

-       __set_errno (ENODEV);

-@@ -50,6 +45,12 @@ __if_nametoindex (const char *ifname)

-     }

- 

-   strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));

-+

-+  int fd = __opensock ();

-+

-+  if (fd < 0)

-+    return 0;

-+

-   if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0)

-     {

-       int saved_errno = errno;

new file mode 100644

@@ -0,0 +1,72 @@

+Submitted By:            Armin K. <krejzi at email dot com>

+Date:                    2013-02-11

+Initial Package Version: 2.17

+Upstream Status:         Not Applicable

+Origin:                  Self

+Description:             This patch removes references to /var/db directory which is not part

+                         of FHS and replaces them with more suitable directories in /var

+                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.

+

+--- a/Makeconfig	2012-12-25 04:02:13.000000000 +0100

+@@ -250,7 +250,7 @@

+ 

+ # Directory for the database files and Makefile for nss_db.

+ ifndef vardbdir

+-vardbdir = $(localstatedir)/db

++vardbdir = $(localstatedir)/lib/nss_db

+ endif

+ inst_vardbdir = $(install_root)$(vardbdir)

+ 

+--- a/nscd/nscd.h	2012-12-25 04:02:13.000000000 +0100

+@@ -112,11 +112,11 @@

+ 

+ 

+ /* Paths of the file for the persistent storage.  */

+-#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"

+-#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"

+-#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"

+-#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"

+-#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"

++#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"

++#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"

++#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"

++#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"

++#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"

+ 

+ /* Path used when not using persistent storage.  */

+ #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"

+--- a/nss/db-Makefile	2012-12-25 04:02:13.000000000 +0100

+@@ -22,7 +22,7 @@

+ 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \

+ 		       /etc/netgroup)

+ 

+-VAR_DB = /var/db

++VAR_DB = /var/lib/nss_db

+ 

+ AWK = awk

+ MAKEDB = makedb --quiet

+--- a/sysdeps/generic/paths.h	2012-12-25 04:02:13.000000000 +0100

+@@ -68,7 +68,7 @@

+ /* Provide trailing slash, since mostly used for building pathnames. */

+ #define	_PATH_DEV	"/dev/"

+ #define	_PATH_TMP	"/tmp/"

+-#define	_PATH_VARDB	"/var/db/"

++#define	_PATH_VARDB	"/var/lib/nss_db/"

+ #define	_PATH_VARRUN	"/var/run/"

+ #define	_PATH_VARTMP	"/var/tmp/"

+ 

+--- a/sysdeps/unix/sysv/linux/paths.h	2012-12-25 04:02:13.000000000 +0100

+@@ -68,7 +68,7 @@

+ /* Provide trailing slash, since mostly used for building pathnames. */

+ #define	_PATH_DEV	"/dev/"

+ #define	_PATH_TMP	"/tmp/"

+-#define	_PATH_VARDB	"/var/db/"

++#define	_PATH_VARDB	"/var/lib/nss_db/"

+ #define	_PATH_VARRUN	"/var/run/"

+ #define	_PATH_VARTMP	"/var/tmp/"

+ 

@@ -3,24 +3,23 @@

 Summary:        Main C library

 Name:           glibc

-Version:        2.28

-Release:        5%{?dist}

+Version:        2.31

+Release:        1%{?dist}

 License:        LGPLv2+

 URL:            http://www.gnu.org/software/libc

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz

-%define sha1    glibc=ccb5dc9e51a9884df8488f86982439d47b283b2a

+%define sha1    glibc=55619672e5e13996e264d408949eb4aaa26e7ec8

 Source1:        locale-gen.sh

 Source2:        locale-gen.conf

-Patch0:         http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.25-fhs-1.patch

+Patch0:         http://www.linuxfromscratch.org/patches/downloads/glibc/glibc-2.31-fhs-1.patch

 Patch1:         glibc-2.24-bindrsvport-blacklist.patch

 Patch2:         0002-malloc-arena-fix.patch

-Patch3:         glibc-2.28-CVE-2018-19591.patch

-Patch4:         CVE-2019-9169.patch

 Provides:       rtld(GNU_HASH)

 Requires:       filesystem

+%define ExtraBuildRequires python3, python3-libs

 %description

 This library provides the basic routines for allocating memory,

 searching directories, opening and closing files, reading and

@@ -75,8 +74,6 @@ sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

-%patch3 -p1

-%patch4 -p1

 install -vdm 755 %{_builddir}/%{name}-build

 # do not try to explicitly provide GLIBC_PRIVATE versioned libraries

 %define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh

@@ -107,19 +104,19 @@ chmod +x find_requires.sh

 %build

-# make aarch64 use /lib64 instead of /lib (same as x86_64)

-sed -i "s/libc_cv_rtlddir='\/lib'/libc_cv_rtlddir='\/lib64'/" sysdeps/unix/sysv/linux/aarch64/configure

-

 cd %{_builddir}/%{name}-build

 ../%{name}-%{version}/configure \

         --prefix=%{_prefix} \

         --build=%{_build} \

         --host=%{_host} \

         --disable-profile \

+        --disable-werror \

         --enable-kernel=3.2 \

         --enable-bind-now \

+        --enable-stack-protector=strong \

         --disable-experimental-malloc \

-        --disable-silent-rules

+        --disable-silent-rules \

+        libc_cv_slibdir=/lib

 # Sometimes we have false "out of memory" make error

 # just rerun/continue make to workaroung it.

@@ -197,11 +194,17 @@ make %{?_smp_mflags} check ||:

 # FAIL (intermittent) in chroot but PASS in container:

 # posix/tst-spawn3 and stdio-common/test-vfprintf

 n=0

-grep "^FAIL: posix/tst-spawn3" tests.sum >/dev/null && n=$((n+1)) ||:

-grep "^FAIL: stdio-common/test-vfprintf" tests.sum >/dev/null && n=$((n+1)) ||:

-# FAIL always on overlayfs/aufs (in container)

-grep "^FAIL: posix/tst-dir" tests.sum >/dev/null && n=$((n+1)) ||:

+grep "^FAIL: c++-types-check" tests.sum >/dev/null && n=$((n+1)) ||:

+# can fail in chroot

+grep "^FAIL: io/tst-fchownat" tests.sum >/dev/null && n=$((n+1)) ||:

+grep "^FAIL: malloc/tst-tcfree2" tests.sum >/dev/null && n=$((n+1)) ||:

+# can timeout

+grep "^FAIL: nptl/tst-mutex10" tests.sum >/dev/null && n=$((n+1)) ||:

+# can fail in chroot

+grep "^FAIL: nptl/tst-setuid3" tests.sum >/dev/null && n=$((n+1)) ||:

+grep "^FAIL: stdlib/tst-secure-getenv" tests.sum >/dev/null && n=$((n+1)) ||:

+grep "^FAIL: support/tst-support_descriptors" tests.sum >/dev/null && n=$((n+1)) ||:

 #https://sourceware.org/glibc/wiki/Testing/Testsuite

 grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 #This happens because the kernel fails to reap exiting threads fast enough,

@@ -224,16 +227,9 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 %attr(0644,root,root) %config(missingok,noreplace) %{_sysconfdir}/ld.so.cache

 %config %{_sysconfdir}/locale-gen.conf

-%ifarch %{ix86}

 /lib/*

 %exclude /lib/libpcprofile.so

 %{_libdir}/*.so

-%else

-/lib64/*

-%exclude /lib64/libpcprofile.so

-%{_lib64dir}/*.so

-%endif

-

 /sbin/ldconfig

 /sbin/locale-gen.sh

 %{_bindir}/*

@@ -254,11 +250,7 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 %files iconv

 %defattr(-,root,root)

-%ifarch %{ix86}

 %{_libdir}/gconv/*

-%else

-%{_lib64dir}/gconv/*

-%endif

 /usr/bin/iconv

 /usr/sbin/iconvconfig

@@ -274,13 +266,8 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 /usr/sbin/zdump

 /usr/sbin/zic

 /sbin/sln

-%ifarch %{ix86}

 %{_libdir}/audit/*

 /lib/libpcprofile.so

-%else

-%{_lib64dir}/audit/*

-/lib64/libpcprofile.so

-%endif

 %files nscd

 %defattr(-,root,root)

@@ -301,13 +288,8 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 %defattr(-,root,root)

 # TODO: Excluding for now to remove dependency on PERL

 # /usr/bin/mtrace

-%ifarch %{ix86}

 %{_libdir}/*.a

 %{_libdir}/*.o

-%else

-%{_lib64dir}/*.a

-%{_lib64dir}/*.o

-%endif

 %{_includedir}/*

 %files -f %{name}.lang lang

@@ -315,6 +297,8 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||:

 %changelog

+*   Thu Mar 12 2020 Alexey Makhalov <amakhalov@vmware.com> 2.31-1

+-   Version update. Use /lib

 *   Tue Sep 24 2019 Alexey Makhalov <amakhalov@vmware.com> 2.28-5

 -   Cross compilling support

 -   Create empty ld.so.cache file for all builds (native and cross)

new file mode 100644

@@ -0,0 +1,78 @@

+From 57586a1ca7f17b1916aed3dea4ff8de872dbf853 Mon Sep 17 00:00:00 2001

+From: Benjamin Peterson <benjamin@dropbox.com>

+Date: Fri, 3 May 2019 08:11:00 -0700

+Subject: [PATCH] Rename gettid() functions.

+

+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.

+---

+ src/core/lib/gpr/log_linux.cc          | 6 ++----

+ src/core/lib/gpr/log_posix.cc          | 4 ++--

+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--

+ 3 files changed, 6 insertions(+), 8 deletions(-)

+

+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc

+index 81026e5689b..8b597b4cf2f 100644

+--- a/src/core/lib/gpr/log_linux.cc

+@@ -40,7 +40,7 @@

+ #include <time.h>

+ #include <unistd.h>

+ 

+-static long gettid(void) { return syscall(__NR_gettid); }

++static long sys_gettid(void) { return syscall(__NR_gettid); }

+ 

+ void gpr_log(const char* file, int line, gpr_log_severity severity,

+              const char* format, ...) {

+@@ -72,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {

+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);

+   struct tm tm;

+   static __thread long tid = 0;

+-  if (tid == 0) tid = gettid();

++  if (tid == 0) tid = sys_gettid();

+ 

+   timer = static_cast<time_t>(now.tv_sec);

+   final_slash = strrchr(args->file, '/');

+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc

+index b6edc14ab6b..2f7c6ce3760 100644

+--- a/src/core/lib/gpr/log_posix.cc

+@@ -31,7 +31,7 @@

+ #include <string.h>

+ #include <time.h>

+ 

+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }

++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }

+ 

+ void gpr_log(const char* file, int line, gpr_log_severity severity,

+              const char* format, ...) {

+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {

+   char* prefix;

+   gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]",

+                gpr_log_severity_string(args->severity), time_buffer,

+-               (int)(now.tv_nsec), gettid(), display_file, args->line);

++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);

+ 

+   fprintf(stderr, "%-70s %s\n", prefix, args->message);

+   gpr_free(prefix);

+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc

+index c2d80c08ddb..4a83cb6c215 100644

+--- a/src/core/lib/iomgr/ev_epollex_linux.cc

+@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,

+ }

+ 

+ #ifndef NDEBUG

+-static long gettid(void) { return syscall(__NR_gettid); }

++static long sys_gettid(void) { return syscall(__NR_gettid); }

+ #endif

+ 

+ /* pollset->mu lock must be held by the caller before calling this.

+@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,

+ #define WORKER_PTR (&worker)

+ #endif

+ #ifndef NDEBUG

+-  WORKER_PTR->originator = gettid();

++  WORKER_PTR->originator = sys_gettid();

+ #endif

+   if (grpc_polling_trace.enabled()) {

+     gpr_log(GPR_INFO,

@@ -1,7 +1,7 @@

 Summary:        Google RPC

 Name:           grpc

 Version:        1.15.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Apache License, Version 2.0

 URL:            https://grpc.io

 Group:          Development/Libraries

@@ -9,6 +9,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/grpc/grpc/archive/%{name}-%{version}.tar.gz

 %define sha1 grpc=0c5ab74d3f64800dbf6005ec337e4291f04df438

+Patch0:         grpc-rename-gettid-functions.patch

 BuildRequires:  build-essential

 BuildRequires:  which

 BuildRequires:  c-ares-devel

@@ -40,6 +41,7 @@ developing applications that use grpc.

 %prep

 %setup -q

+%patch0 -p1

 %build

 make  %{_smp_mflags} prefix=%{_prefix} libdir=%{_libdir}

@@ -64,6 +66,8 @@ ln -sf libgrpc++_error_details.so.6 %{buildroot}%{_libdir}/libgrpc++_error_detai

 %{_libdir}/pkgconfig/*

 %changelog

+* Wed Mar 25 2020 Alexey Makhalov <amakhalov@vmware.com> 1.15.1-2

+- Fix compilation issue with glibc >= 2.30.

 * Thu Oct 04 2018 Siju Maliakkal <smaliakkal@vmware.com> 1.15.1-1

 - Updated to latest version

 * Tue Mar 27 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.10.0-1

new file mode 100644

@@ -0,0 +1,53 @@

+From f4f9d24860e1b5cd4f6a014f3fda7cd33ebe5be7 Mon Sep 17 00:00:00 2001

+From: Petr Lautrbach <plautrba@redhat.com>

+Date: Sat, 27 Jul 2019 08:20:20 -0700

+Subject: [PATCH] libselinux: Do not define gettid() if glibc >= 2.30 is used

+MIME-Version: 1.0

+Content-Type: text/plain; charset=UTF-8

+Content-Transfer-Encoding: 8bit

+

+Since version 2.30 glibc implements gettid() system call wrapper, see

+https://sourceware.org/bugzilla/show_bug.cgi?id=6399

+

+Fixes:

+cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE  -DNO_ANDROID_BACKEND   -c -o procattr.o procattr.c

+procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration

+   28 | static pid_t gettid(void)

+      |              ^~~~~~

+In file included from /usr/include/unistd.h:1170,

+                 from procattr.c:2:

+/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here

+   34 | extern __pid_t gettid (void) __THROW;

+      |                ^~~~~~

+

+Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

+Acked-by: Stephen Smalley <sds@tycho.nsa.gov>

+Signed-off-by: Khem Raj <raj.khem@gmail.com>

+---

+ src/procattr.c | 14 +++++++++++++-

+ 1 file changed, 13 insertions(+), 1 deletion(-)

+

+--- a/src/procattr.c

+@@ -21,8 +21,19 @@

+ static int destructor_key_initialized = 0;

+ static __thread char destructor_initialized;

+ 

+-#ifndef __BIONIC__

+-/* Bionic declares this in unistd.h and has a definition for it */

++/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and

++ * has a definition for it */

++#ifdef __BIONIC__

++  #define OVERRIDE_GETTID 0

++#elif !defined(__GLIBC_PREREQ)

++  #define OVERRIDE_GETTID 1

++#elif !__GLIBC_PREREQ(2,29)

++  #define OVERRIDE_GETTID 1

++#else

++  #define OVERRIDE_GETTID 0

++#endif

++

++#if OVERRIDE_GETTID

+ static pid_t gettid(void)

+ {

+ 	return syscall(__NR_gettid);

@@ -3,11 +3,12 @@

 Summary:        SELinux library and simple utilities

 Name:           libselinux

 Version:        2.8

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Public Domain

 Group:          System Environment/Libraries

 Source0:        https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/%{name}-%{version}.tar.gz

 %define sha1    libselinux=d45f2db91dbec82ef5a153aca247acc04234e8af

+Patch0:         0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch

 Url:            https://github.com/SELinuxProject/selinux/wiki

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -77,6 +78,7 @@ SELinux applications.

 %prep

 %setup -qn %{name}-%{version}

+%patch0 -p1

 %build

 sed '/unistd.h/a#include <sys/uio.h>' -i src/setrans_client.c

@@ -131,6 +133,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %changelog

+*   Wed Mar 25 2020 Alexey Makhalov <amakhalov@vmware.com> 2.8-3

+-   Fix compilation issue with glibc >= 2.30.

 *   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 2.8-2

 -   Added BuildRequires python2-devel

 *   Fri Aug 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8-1

new file mode 100644

@@ -0,0 +1,48 @@

+Add support for gettid() provided by glibc 2.30+

+

+Since version 2.30 glibc provides gettid and it causes conflicts with

+locally defined gettid(). Use the local definition of

+gettid only if system gettid is not available.

+

+https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD<Paste>

+

+Signed-off-by: Khem Raj <raj.khem at gmail.com>

+---

+ configure.ac            | 2 +-

+ src/common/compat/tid.h | 3 ++-

+ 2 files changed, 3 insertions(+), 2 deletions(-)

+

+diff --git a/configure.ac b/configure.ac

+index 7b99f5c..e4bd82c 100644

+--- a/configure.ac

+@@ -190,7 +190,7 @@ AC_CHECK_HEADERS([ \

+ # Basic functions check

+ AC_CHECK_FUNCS([ \

+ 	atexit bzero clock_gettime dup2 fdatasync fls ftruncate \

+-	gethostbyname gethostname getpagesize localtime_r memchr memset \

++	gethostbyname gethostname getpagesize gettid localtime_r memchr memset \

+ 	mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \

+ 	strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \

+ 	strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \

+diff --git a/src/common/compat/tid.h b/src/common/compat/tid.h

+index 40f562f..aa07a85 100644

+--- a/src/common/compat/tid.h

+@@ -25,6 +25,7 @@

+ #ifndef LTTNG_TID_H

+ #define LTTNG_TID_H

+ 

++#if !HAVE_GETTID

+ #ifdef __linux__

+ #include <syscall.h>

+ #endif

+@@ -47,5 +48,5 @@ static inline pid_t gettid(void)

+ 	return getpid();

+ }

+ #endif

+-

++#endif /* HAVE_GETTID */

+ #endif /* LTTNG_TID_H */

+-- 

+2.22.0

@@ -1,11 +1,12 @@

 Summary: LTTng is an open source tracing framework for Linux.

 Name:    lttng-tools

 Version: 2.10.5

-Release: 1%{?dist}

+Release: 2%{?dist}

 License: GPLv2 and LGPLv2

 URL: https://lttng.org/download/

 Source: %{name}-%{version}.tar.bz2

 %define sha1 lttng-tools=68790d44529a3b29896c35bb2350e8a0e1226264

+Patch0:     add-support-for-gettid.patch

 Group:      Development/Tools

 Vendor:     VMware, Inc.

 Distribution:  Photon

@@ -26,11 +27,11 @@ LTTng is an open source tracing framework for Linux.

 %prep

 %setup -q

+%patch0 -p1

 %build

-./configure \

-	--prefix=%{_prefix} \

-	--disable-lttng-ust

+autoreconf -fiv

+%configure

 make %{?_smp_mflags}

@@ -46,6 +47,8 @@ find %{buildroot} -name '*.la' -delete

 %exclude %{_libdir}/debug

 %changelog

+*   Tue Mar 24 2020 Alexey Makhalov <amakhalov@vmware.com> 2.10.5-2

+-   Fix compilation issue with glibc >= 2.30.

 *   Wed Sep 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.10.5-1

 -   Update to version 2.10.5

 *   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 2.9.4-1

@@ -58,4 +61,3 @@ find %{buildroot} -name '*.la' -delete

 -   Updated to version 2.7.1

 *   Tue Nov 24 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-1

 -   Initial build.  First version

- 

new file mode 100644

@@ -0,0 +1,87 @@

+From 3e2aaf78e6f8d57c7dbc42e39764862ba8c64bd7 Mon Sep 17 00:00:00 2001

+From: Michael Jeanson <mjeanson@efficios.com>

+Date: Mon, 3 Jun 2019 15:25:32 -0400

+Subject: [PATCH] Fix: namespace our gettid wrapper

+

+Since glibc 2.30, a gettid wrapper was added that conflicts with our

+static declaration. Namespace our wrapper so there is no conflict,

+we'll add support for the glibc provided wrapper in a further commit.

+

+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

+---

+ include/lttng/ust-tid.h           | 12 +++++++-----

+ include/usterr-signal-safe.h      |  2 +-

+ liblttng-ust/lttng-context-vtid.c |  4 ++--

+ 3 files changed, 10 insertions(+), 8 deletions(-)

+

+diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h

+index e669d7e7..e637718a 100644

+--- a/include/lttng/ust-tid.h

+@@ -31,23 +31,25 @@

+ #include <syscall.h>

+ #endif

+ 

+-#if defined(_syscall0)

+-_syscall0(pid_t, gettid)

+-#elif defined(__NR_gettid)

++#if defined(__NR_gettid)

++

+ #include <unistd.h>

+-static inline pid_t gettid(void)

++static inline pid_t lttng_gettid(void)

+ {

+ 	return syscall(__NR_gettid);

+ }

++

+ #else

++

+ #include <sys/types.h>

+ #include <unistd.h>

+ 

+ /* Fall-back on getpid for tid if not available. */

+-static inline pid_t gettid(void)

++static inline pid_t lttng_gettid(void)

+ {

+ 	return getpid();

+ }

++

+ #endif