|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
#
|
|
# Filename: package/.../musl/pkg/gcc/0020-libstdc-futex-add-time64-compatibility.patch
|
|
# Copyright (C) 2020 The OpenSDE Project
|
|
#
|
|
# More information can be found in the files COPYING and README.
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
From 9684a815e1cbe854383c3c511e1d84d43c46ec94 Mon Sep 17 00:00:00 2001
|
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
|
Date: Fri, 21 Aug 2020 07:00:17 +0000
|
|
Subject: [PATCH 20/30] libstdc++: futex: add time64 compatibility
|
|
|
|
---
|
|
libstdc++-v3/src/c++11/futex.cc | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
|
|
index c9de11a7ec7..7be702dbeda 100644
|
|
--- a/libstdc++-v3/src/c++11/futex.cc
|
|
+++ b/libstdc++-v3/src/c++11/futex.cc
|
|
@@ -61,7 +61,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
struct timeval tv;
|
|
gettimeofday (&tv, NULL);
|
|
// Convert the absolute timeout value to a relative timeout
|
|
+#if defined(SYS_futex_time64)
|
|
+ struct
|
|
+ {
|
|
+ long tv_sec;
|
|
+ long tv_nsec;
|
|
+ } rt;
|
|
+#else
|
|
struct timespec rt;
|
|
+#endif
|
|
rt.tv_sec = __s.count() - tv.tv_sec;
|
|
rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
|
|
if (rt.tv_nsec < 0)
|
|
--
|
|
2.27.0
|
|
|