Turns out gtest still prefers the system <tr1/tuple> over it's own

[oota-llvm.git] / utils / llvm.grm

diff --git a/utils/llvm.grm b/utils/llvm.grm
index 4499d4b35a9f7c5124a3aa34a84f90683d040e4a..fa0dcd1e1520ccddf80d0aeb5d71dfdd6a5179e7 100644 (file)
--- a/utils/llvm.grm
+++ b/utils/llvm.grm
@@ -161,6 +161,8 @@ FuncAttr      ::= noreturn
  | signext
  | readnone
  | readonly
+ | inlinehint
+ | alignstack
  | noinline
  | alwaysinline
  | optsize
@@ -396,7 +398,7 @@ OptVolatile ::= - volatile | _ ;
 OptExact ::= - exact | _ ;
 OptNSW ::= - nsw | _ ;
 OptNUW ::= - nuw | _ ;
-OptNW  ::= OptNUW OptNSW ;
+OptNW  ::= OptNUW OptNSW | OptNSW OptNUW ;
 OptInBounds  ::= - inbounds | _ ;
 
 MemoryInst ::= malloc Types OptCAlign