[llvm-branch-commits] [cfe-branch] r243442 - Merging r243417:

[Hans Wennborg]

Author: hans
Date: Tue Jul 28 11:39:38 2015
New Revision: 243442

URL: http://llvm.org/viewvc/llvm-project?rev=243442&view=rev
Log:
Merging r243417:
------------------------------------------------------------------------
r243417 | kbeyls | 2015-07-28 07:23:47 -0700 (Tue, 28 Jul 2015) | 3 lines

RegParmMax must be 0 for AArch64, as the regparm function attribute is not supported on AArch64.


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

Modified:
    cfe/branches/release_37/   (props changed)
    cfe/branches/release_37/lib/Basic/Targets.cpp
    cfe/branches/release_37/test/CodeGen/le32-regparm.c

Propchange: cfe/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 11:39:38 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242660,242662,242667,242678,242766,242905,242973,243018,243048,243098,243101,243105,243144,243153,243196
+/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242660,242662,242667,242678,242766,242905,242973,243018,243048,243098,243101,243105,243144,243153,243196,243417
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_37/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/lib/Basic/Targets.cpp?rev=243442&r1=243441&r2=243442&view=diff
==============================================================================
--- cfe/branches/release_37/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_37/lib/Basic/Targets.cpp Tue Jul 28 11:39:38 2015
@@ -4978,7 +4978,6 @@ public:
 
     LongWidth = LongAlign = PointerWidth = PointerAlign = 64;
     MaxVectorAlign = 128;
-    RegParmMax = 8;
     MaxAtomicInlineWidth = 128;
     MaxAtomicPromoteWidth = 128;
 

Modified: cfe/branches/release_37/test/CodeGen/le32-regparm.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/CodeGen/le32-regparm.c?rev=243442&r1=243441&r2=243442&view=diff
==============================================================================
--- cfe/branches/release_37/test/CodeGen/le32-regparm.c (original)
+++ cfe/branches/release_37/test/CodeGen/le32-regparm.c Tue Jul 28 11:39:38 2015
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -triple le32-unknown-nacl %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple aarch64 %s -fsyntax-only -verify
 
 void __attribute__((regparm(2))) fc_f1(int i, int j, int k) {} // expected-error{{'regparm' is not valid on this platform}}