Commit 3ce6eede authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging Clang-side of r275967: (the LLVM side already merged in r276561) 

------------------------------------------------------------------------
r275967 | dsanders | 2016-07-19 03:49:03 -0700 (Tue, 19 Jul 2016) | 16 lines

[mips] Correct label prefixes for N32 and N64.

Summary:
N32 and N64 follow the standard ELF conventions (.L) whereas O32 uses its own
($).

This fixes the majority of object differences between -fintegrated-as and
-fno-integrated-as.

Reviewers: sdardis

Subscribers: dsanders, sdardis, llvm-commits

Differential Revision: https://reviews.llvm.org/D22412


------------------------------------------------------------------------

llvm-svn: 276643
parent 5bdc21f2

clang/lib/Basic/Targets.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7094,9 +7094,9 @@ class MipsTargetInfo : public TargetInfo { 
    if (ABI == "o32")

      Layout = "m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64";

    else if (ABI == "n32")

      Layout = "m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128";

      Layout = "m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128";

    else if (ABI == "n64")

      Layout = "m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128";

      Layout = "m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128";

    else

      llvm_unreachable("Invalid ABI");

clang/test/CodeGen/target-data.c

+4 −4
Original line number Diff line number Diff line
@@ -40,19 +40,19 @@ 


// RUN: %clang_cc1 -triple mips64el-linux-gnu -o - -emit-llvm %s | \

// RUN: FileCheck %s -check-prefix=MIPS-64EL

// MIPS-64EL: target datalayout = "e-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128"

// MIPS-64EL: target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128"



// RUN: %clang_cc1 -triple mips64el-linux-gnu -o - -emit-llvm -target-abi n32 \

// RUN: %s | FileCheck %s -check-prefix=MIPS-64EL-N32

// MIPS-64EL-N32: target datalayout = "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"

// MIPS-64EL-N32: target datalayout = "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"



// RUN: %clang_cc1 -triple mips64-linux-gnu -o - -emit-llvm %s | \

// RUN: FileCheck %s -check-prefix=MIPS-64EB

// MIPS-64EB: target datalayout = "E-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128"

// MIPS-64EB: target datalayout = "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128"



// RUN: %clang_cc1 -triple mips64-linux-gnu -o - -emit-llvm %s -target-abi n32 \

// RUN: | FileCheck %s -check-prefix=MIPS-64EB-N32

// MIPS-64EB-N32: target datalayout = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"

// MIPS-64EB-N32: target datalayout = "E-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32:64-S128"



// RUN: %clang_cc1 -triple powerpc64-lv2 -o - -emit-llvm %s | \

// RUN: FileCheck %s -check-prefix=PS3