Browse Source

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  msun: swap words order instead of bits order on BIG ENDIAN
  Do not use macros in -width
  Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp llvmorg-10.0.0-0-gd32170dbd5b (aka 10.0.0 release).
  Install expected kyua docs.
hardened/current/tmpfs_extattr
HardenedBSD Sync Service 2 months ago
parent
commit
5bdc1c7d04
15 changed files with 66 additions and 36 deletions
  1. +4
    -2
      contrib/llvm-project/clang/include/clang/Sema/Sema.h
  2. +19
    -13
      contrib/llvm-project/clang/lib/Driver/ToolChains/Cuda.cpp
  3. +6
    -0
      contrib/llvm-project/clang/lib/Driver/ToolChains/Cuda.h
  4. +6
    -0
      contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp
  5. +2
    -1
      contrib/llvm-project/clang/lib/Parse/ParseTemplate.cpp
  6. +8
    -5
      contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp
  7. +1
    -1
      contrib/llvm-project/clang/lib/Sema/TreeTransform.h
  8. +2
    -0
      etc/mtree/BSD.usr.dist
  9. +4
    -4
      lib/clang/include/VCSVersion.inc
  10. +1
    -1
      lib/clang/include/llvm/Support/VCSRevision.h
  11. +1
    -1
      lib/kyua/Makefile.kyua
  12. +1
    -1
      lib/kyua/cli/Makefile
  13. +5
    -4
      lib/msun/src/s_nan.c
  14. +4
    -1
      usr.bin/kyua/Makefile
  15. +2
    -2
      usr.bin/su/su.1

+ 4
- 2
contrib/llvm-project/clang/include/clang/Sema/Sema.h View File

@@ -6885,7 +6885,8 @@ public:
QualType ObjectType, bool EnteringContext,
bool &MemberOfUnknownSpecialization,
SourceLocation TemplateKWLoc = SourceLocation(),
AssumedTemplateKind *ATK = nullptr);
AssumedTemplateKind *ATK = nullptr,
bool Disambiguation = false);

TemplateNameKind isTemplateName(Scope *S,
CXXScopeSpec &SS,
@@ -6894,7 +6895,8 @@ public:
ParsedType ObjectType,
bool EnteringContext,
TemplateTy &Template,
bool &MemberOfUnknownSpecialization);
bool &MemberOfUnknownSpecialization,
bool Disambiguation = false);

/// Try to resolve an undeclared template name as a type template.
///

+ 19
- 13
contrib/llvm-project/clang/lib/Driver/ToolChains/Cuda.cpp View File

@@ -32,24 +32,28 @@ using namespace llvm::opt;

// Parses the contents of version.txt in an CUDA installation. It should
// contain one line of the from e.g. "CUDA Version 7.5.2".
static CudaVersion ParseCudaVersionFile(const Driver &D, llvm::StringRef V) {
void CudaInstallationDetector::ParseCudaVersionFile(llvm::StringRef V) {
Version = CudaVersion::UNKNOWN;
if (!V.startswith("CUDA Version "))
return CudaVersion::UNKNOWN;
return;
V = V.substr(strlen("CUDA Version "));
SmallVector<StringRef,4> VersionParts;
V.split(VersionParts, '.');
if (VersionParts.size() < 2)
return CudaVersion::UNKNOWN;
std::string MajorMinor = join_items(".", VersionParts[0], VersionParts[1]);
CudaVersion Version = CudaStringToVersion(MajorMinor);
return;
DetectedVersion = join_items(".", VersionParts[0], VersionParts[1]);
Version = CudaStringToVersion(DetectedVersion);
if (Version != CudaVersion::UNKNOWN)
return Version;
return;

// Issue a warning and assume that the version we've found is compatible with
// the latest version we support.
D.Diag(diag::warn_drv_unknown_cuda_version)
<< MajorMinor << CudaVersionToString(CudaVersion::LATEST);
return CudaVersion::LATEST;
Version = CudaVersion::LATEST;
DetectedVersionIsNotSupported = true;
}

void CudaInstallationDetector::WarnIfUnsupportedVersion() {
if (DetectedVersionIsNotSupported)
D.Diag(diag::warn_drv_unknown_cuda_version)
<< DetectedVersion << CudaVersionToString(Version);
}

CudaInstallationDetector::CudaInstallationDetector(
@@ -147,7 +151,7 @@ CudaInstallationDetector::CudaInstallationDetector(
// version.txt isn't present.
Version = CudaVersion::CUDA_70;
} else {
Version = ParseCudaVersionFile(D, (*VersionFile)->getBuffer());
ParseCudaVersionFile((*VersionFile)->getBuffer());
}

if (Version >= CudaVersion::CUDA_90) {
@@ -565,8 +569,10 @@ CudaToolChain::CudaToolChain(const Driver &D, const llvm::Triple &Triple,
const Action::OffloadKind OK)
: ToolChain(D, Triple, Args), HostTC(HostTC),
CudaInstallation(D, HostTC.getTriple(), Args), OK(OK) {
if (CudaInstallation.isValid())
if (CudaInstallation.isValid()) {
CudaInstallation.WarnIfUnsupportedVersion();
getProgramPaths().push_back(CudaInstallation.getBinPath());
}
// Lookup binaries into the driver directory, this is used to
// discover the clang-offload-bundler executable.
getProgramPaths().push_back(getDriver().Dir);

+ 6
- 0
contrib/llvm-project/clang/lib/Driver/ToolChains/Cuda.h View File

@@ -30,6 +30,8 @@ private:
const Driver &D;
bool IsValid = false;
CudaVersion Version = CudaVersion::UNKNOWN;
std::string DetectedVersion;
bool DetectedVersionIsNotSupported = false;
std::string InstallPath;
std::string BinPath;
std::string LibPath;
@@ -75,6 +77,10 @@ public:
std::string getLibDeviceFile(StringRef Gpu) const {
return LibDeviceMap.lookup(Gpu);
}
void WarnIfUnsupportedVersion();

private:
void ParseCudaVersionFile(llvm::StringRef V);
};

namespace tools {

+ 6
- 0
contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp View File

@@ -3252,6 +3252,9 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
goto DoneWithDeclSpec;
if (isTypeConstraintAnnotation())
continue;
if (NextToken().is(tok::annot_template_id))
// Might have been annotated by TryAnnotateTypeConstraint.
continue;
// Eat the scope spec so the identifier is current.
ConsumeAnnotationToken();
ParsedAttributesWithRange Attrs(AttrFactory);
@@ -3405,6 +3408,9 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
goto DoneWithDeclSpec;
if (isTypeConstraintAnnotation())
continue;
if (Tok.is(tok::annot_template_id))
// Might have been annotated by TryAnnotateTypeConstraint.
continue;
ParsedAttributesWithRange Attrs(AttrFactory);
if (ParseImplicitInt(DS, nullptr, TemplateInfo, AS, DSContext, Attrs)) {
if (!Attrs.empty()) {

+ 2
- 1
contrib/llvm-project/clang/lib/Parse/ParseTemplate.cpp View File

@@ -710,7 +710,8 @@ bool Parser::TryAnnotateTypeConstraint() {
/*ObjectType=*/ParsedType(),
/*EnteringContext=*/false,
PossibleConcept,
MemberOfUnknownSpecialization);
MemberOfUnknownSpecialization,
/*Disambiguation=*/true);
if (MemberOfUnknownSpecialization || !PossibleConcept ||
TNK != TNK_Concept_template) {
if (SS.isNotEmpty())

+ 8
- 5
contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp View File

@@ -174,7 +174,8 @@ TemplateNameKind Sema::isTemplateName(Scope *S,
ParsedType ObjectTypePtr,
bool EnteringContext,
TemplateTy &TemplateResult,
bool &MemberOfUnknownSpecialization) {
bool &MemberOfUnknownSpecialization,
bool Disambiguation) {
assert(getLangOpts().CPlusPlus && "No template names in C!");

DeclarationName TName;
@@ -204,7 +205,7 @@ TemplateNameKind Sema::isTemplateName(Scope *S,
LookupResult R(*this, TName, Name.getBeginLoc(), LookupOrdinaryName);
if (LookupTemplateName(R, S, SS, ObjectType, EnteringContext,
MemberOfUnknownSpecialization, SourceLocation(),
&AssumedTemplate))
&AssumedTemplate, Disambiguation))
return TNK_Non_template;

if (AssumedTemplate != AssumedTemplateKind::None) {
@@ -371,7 +372,8 @@ bool Sema::LookupTemplateName(LookupResult &Found,
bool EnteringContext,
bool &MemberOfUnknownSpecialization,
SourceLocation TemplateKWLoc,
AssumedTemplateKind *ATK) {
AssumedTemplateKind *ATK,
bool Disambiguation) {
if (ATK)
*ATK = AssumedTemplateKind::None;

@@ -494,8 +496,9 @@ bool Sema::LookupTemplateName(LookupResult &Found,
}
}

if (Found.empty() && !IsDependent) {
// If we did not find any names, attempt to correct any typos.
if (Found.empty() && !IsDependent && !Disambiguation) {
// If we did not find any names, and this is not a disambiguation, attempt
// to correct any typos.
DeclarationName Name = Found.getLookupName();
Found.clear();
// Simple filter callback that, for keywords, only accepts the C++ *_cast

+ 1
- 1
contrib/llvm-project/clang/lib/Sema/TreeTransform.h View File

@@ -11303,7 +11303,7 @@ TreeTransform<Derived>::TransformRequiresExpr(RequiresExpr *E) {
SemaRef, Sema::ExpressionEvaluationContext::Unevaluated);

RequiresExprBodyDecl *Body = RequiresExprBodyDecl::Create(
getSema().Context, E->getBody()->getDeclContext(),
getSema().Context, getSema().CurContext,
E->getBody()->getBeginLoc());

Sema::ContextRAII SavedContext(getSema(), Body, /*NewThisContext*/false);

+ 2
- 0
etc/mtree/BSD.usr.dist View File

@@ -213,6 +213,8 @@
..
atf
..
kyua
..
legal
..
llvm

+ 4
- 4
lib/clang/include/VCSVersion.inc View File

@@ -1,14 +1,14 @@
// $FreeBSD$

#define LLVM_REVISION "llvmorg-10.0.0-rc4-5-g52c365aa9ca"
#define LLVM_REVISION "llvmorg-10.0.0-0-gd32170dbd5b"
#define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"

#define CLANG_REVISION "llvmorg-10.0.0-rc4-5-g52c365aa9ca"
#define CLANG_REVISION "llvmorg-10.0.0-0-gd32170dbd5b"
#define CLANG_REPOSITORY "git@github.com:llvm/llvm-project.git"

// <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
#define LLD_REVISION "llvmorg-10.0.0-rc4-5-g52c365aa9ca-1300007"
#define LLD_REVISION "llvmorg-10.0.0-0-gd32170dbd5b-1300007"
#define LLD_REPOSITORY "FreeBSD"

#define LLDB_REVISION "llvmorg-10.0.0-rc4-5-g52c365aa9ca"
#define LLDB_REVISION "llvmorg-10.0.0-0-gd32170dbd5b"
#define LLDB_REPOSITORY "git@github.com:llvm/llvm-project.git"

+ 1
- 1
lib/clang/include/llvm/Support/VCSRevision.h View File

@@ -1,3 +1,3 @@
/* $FreeBSD$ */
#define LLVM_REVISION "llvmorg-10.0.0-rc4-5-g52c365aa9ca"
#define LLVM_REVISION "llvmorg-10.0.0-0-gd32170dbd5b"
#define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git"

+ 1
- 1
lib/kyua/Makefile.kyua View File

@@ -3,7 +3,7 @@
KYUA_VERSION= 0.13

KYUA_CONFDIR= /etc/kyua
KYUA_DOCDIR= /nonexistant
KYUA_DOCDIR= /usr/share/doc/kyua
KYUA_EGDIR= /usr/share/examples/kyua
KYUA_MISCDIR= /usr/share/kyua/misc
KYUA_STOREDIR= /usr/share/kyua/store

+ 1
- 1
lib/kyua/cli/Makefile View File

@@ -4,7 +4,7 @@ KYUA_LIB= cli
INTERNALLIB=
LIBADD= kyua_drivers kyua_engine kyua_model kyua_store kyua_utils
CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \
-DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \
-DKYUA_DOCDIR=\"${KYUA_DOCDIR}\" \
-DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \
-DPACKAGE=\"kyua\" \
-DPACKAGE_NAME=\"Kyua\" \

+ 5
- 4
lib/msun/src/s_nan.c View File

@@ -66,14 +66,15 @@ _scan_nan(uint32_t *words, int num_words, const char *s)
;

/* Scan backwards, filling in the bits in words[] as we go. */
#if _BYTE_ORDER == _LITTLE_ENDIAN
for (bitpos = 0; bitpos < 32 * num_words; bitpos += 4) {
#else
for (bitpos = 32 * num_words - 4; bitpos >= 0; bitpos -= 4) {
#endif
if (--si < 0)
break;
#if _BYTE_ORDER == _LITTLE_ENDIAN
words[bitpos / 32] |= digittoint(s[si]) << (bitpos % 32);
#else
words[num_words - 1 - bitpos / 32] |=
digittoint(s[si]) << (bitpos % 32);
#endif
}
}


+ 4
- 1
usr.bin/kyua/Makefile View File

@@ -28,11 +28,14 @@ CFLAGS+= -I${KYUA_SRCDIR}
# kyua uses auto_ptr
CFLAGS+= -Wno-deprecated-declarations

FILESGROUPS= EXAMPLES MISC STORE
FILESGROUPS= DOCS EXAMPLES MISC STORE

CONFS= kyua.conf
CONFSDIR= ${KYUA_CONFDIR}

DOCS= AUTHORS CONTRIBUTORS LICENSE
DOCSDIR= ${KYUA_DOCDIR}

EXAMPLES= Kyuafile.top kyua.conf
EXAMPLESDIR= ${KYUA_EGDIR}
.PATH: ${KYUA_SRCDIR}/examples

+ 2
- 2
usr.bin/su/su.1 View File

@@ -28,7 +28,7 @@
.\" @(#)su.1 8.2 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
.Dd August 11, 2013
.Dd March 26, 2020
.Dt SU 1
.Os
.Sh NAME
@@ -187,7 +187,7 @@ The user ID is always the effective ID (the target user ID) after an
unless the user ID is 0 (root).
.El
.Sh FILES
.Bl -tag -width ".Pa /etc/pam.d/su" -compact
.Bl -tag -width "/etc/pam.d/su" -compact
.It Pa /etc/pam.d/su
PAM configuration for
.Nm .

Loading…
Cancel
Save