This is an archive of the discontinued LLVM Phabricator instance.

Differential D96062

[🍒][libc++] Fix libcxx build on 32bit architectures with 64bit time_t defaults e.g. riscv32
ClosedPublic

Authored by ldionne on Feb 4 2021, 10:35 AM.

Details

Reviewers
tstellar
Group Reviewers
Restricted Project
Summary

Patch by Khem Raj.

(cherry pick of commit 85b9c5ccc172a1e61c7ecaaec4752587cb6f1e26)

Diff Detail

Event Timeline

ldionne created this revision.Feb 4 2021, 10:35 AM
Herald added subscribers: vkmr, evandro, sameer.abuasal and 9 others. · View Herald TranscriptFeb 4 2021, 10:35 AM
ldionne requested review of this revision.Feb 4 2021, 10:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 4 2021, 10:35 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
tstellar accepted this revision.Feb 4 2021, 10:36 AM

LGTM.

ldionne mentioned this in D85095: Fix libcxx build on 32bit architectures with 64bit time_t defaults e.g. riscv32.Feb 4 2021, 10:39 AM
Harbormaster completed remote builds in B87955: Diff 321509.Feb 5 2021, 1:45 PM
ldionne accepted this revision as: Restricted Project.Feb 8 2021, 10:49 AM
This revision is now accepted and ready to land.Feb 8 2021, 10:49 AM
ldionne closed this revision.Feb 8 2021, 10:51 AM

251f3295b498b699aa2b926167a788a6b6dbc033

Revision Contents

PathSize
libcxx/
src/
6 lines

Diff 321509

libcxx/src/atomic.cpp

Show All 13 Lines
#include <functional> #include <functional>
#ifdef __linux__ #ifdef __linux__
#include <unistd.h> #include <unistd.h>
#include <linux/futex.h> #include <linux/futex.h>
#include <sys/syscall.h> #include <sys/syscall.h>
// libc++ uses SYS_futex as a universal syscall name. However, on 32 bit architectures
// with a 64 bit time_t, we need to specify SYS_futex_time64.
#if !defined(SYS_futex) && defined(SYS_futex_time64)
# define SYS_futex SYS_futex_time64
#endif
#else // <- Add other operating systems here #else // <- Add other operating systems here
// Baseline needs no new headers // Baseline needs no new headers
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines