diff options
| author | Brad Smith <brad@comstyle.com> | 2017-04-28 00:36:13 +0000 |
|---|---|---|
| committer | Brad Smith <brad@comstyle.com> | 2017-04-28 00:36:13 +0000 |
| commit | 6f1871cebb5ec9a3950bdb44dfa030dd2b4c05ec (patch) | |
| tree | 3e69428bc577c04726579115c903eec51638c872 | |
| parent | 555e77c84b2712de80610d3e1c851b5a2f182372 (diff) | |
Merging r297098:
------------------------------------------------------------------------
r297098 | brad | 2017-03-06 18:48:31 -0500 (Mon, 06 Mar 2017) | 2 lines
Set the Int64Type / IntMaxType types correctly for OpenBSD/mips64
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@301605 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Basic/Targets.cpp | 6 | ||||
| -rw-r--r-- | test/Preprocessor/init.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index a8890b7ef8..445b4120ef 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -7540,7 +7540,11 @@ public: void setN64ABITypes() { setN32N64ABITypes(); - Int64Type = SignedLong; + if (getTriple().getOS() == llvm::Triple::OpenBSD) { + Int64Type = SignedLongLong; + } else { + Int64Type = SignedLong; + } IntMaxType = Int64Type; LongWidth = LongAlign = 64; PointerWidth = PointerAlign = 64; diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c index bb545b2e8f..df7a8a8548 100644 --- a/test/Preprocessor/init.c +++ b/test/Preprocessor/init.c @@ -8718,6 +8718,8 @@ // RUN: %clang_cc1 -E -dM -ffreestanding -triple=aarch64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-unknown-openbsd6.1-gnueabi < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s +// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s +// RUN: %clang_cc1 -E -dM -ffreestanding -triple=mips64el-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc64-unknown-openbsd6.1 < /dev/null | FileCheck -match-full-lines -check-prefix OPENBSD %s // OPENBSD:#define __ELF__ 1 // OPENBSD:#define __INT16_TYPE__ short |