Commit 6269fe42 authored by Brad Smith's avatar Brad Smith
Browse files

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
------------------------------------------------------------------------

llvm-svn: 301605
parent ba8e6140

clang/lib/Basic/Targets.cpp

+5 −1
Original line number Diff line number Diff line
@@ -7540,7 +7540,11 @@ public: 


  void setN64ABITypes() {

    setN32N64ABITypes();

    if (getTriple().getOS() == llvm::Triple::OpenBSD) {

      Int64Type = SignedLongLong;

    } else {

      Int64Type = SignedLong;

    }

    IntMaxType = Int64Type;

    LongWidth = LongAlign = 64;

    PointerWidth = PointerAlign = 64;

clang/test/Preprocessor/init.c

+2 −0
Original line number Diff line number Diff line
@@ -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