From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <maskray@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7814)
 id 82A393857C78; Sat, 28 Aug 2021 00:24:43 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82A393857C78
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Fangrui Song <maskray@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/maskray/grte] Work around clang problem with ifuncs and vdso
X-Act-Checkin: glibc
X-Git-Author: Stan Shebs <stanshebs@google.com>
X-Git-Refname: refs/heads/maskray/grte
X-Git-Oldrev: 96509a9dcec99892802cdf7ac16f9b5e51ffccde
X-Git-Newrev: b35774068a3f606c1fb76476d3e695dc2dacb86e
Message-Id: <20210828002443.82A393857C78@sourceware.org>
Date: Sat, 28 Aug 2021 00:24:43 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Aug 2021 00:24:43 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b35774068a3f606c1fb76476d3e695dc2dacb86e

commit b35774068a3f606c1fb76476d3e695dc2dacb86e
Author: Stan Shebs <stanshebs@google.com>
Date:   Tue Sep 25 07:58:13 2018 -0700

    Work around clang problem with ifuncs and vdso

Diff:
---
 sysdeps/unix/sysv/linux/powerpc/gettimeofday.c | 2 +-
 sysdeps/unix/sysv/linux/powerpc/time.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
index 994a926a87..868e0918aa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
@@ -23,7 +23,7 @@
 
 #include <sys/time.h>
 
-#ifdef SHARED
+#if defined(SHARED) && !defined(__clang__)
 
 # include <dl-vdso.h>
 # include <libc-vdso.h>
diff --git a/sysdeps/unix/sysv/linux/powerpc/time.c b/sysdeps/unix/sysv/linux/powerpc/time.c
index 8814bcc14f..61965fe988 100644
--- a/sysdeps/unix/sysv/linux/powerpc/time.c
+++ b/sysdeps/unix/sysv/linux/powerpc/time.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifdef SHARED
+#if defined(SHARED) && !defined(__clang__)
 # ifndef __powerpc64__
 #  define time __redirect_time
 # else