From f00807aacee0d7ed059f09112ed93f96d03ec878 Mon Sep 17 00:00:00 2001
From: Pierre Chambart <pierre.chambart@ocamlpro.com>
Date: Tue, 12 Jan 2016 17:04:08 +0100
Subject: [PATCH] Fix asmcomp testsuite

---
 testsuite/tests/asmcomp/Makefile     | 2 +-
 testsuite/tests/asmcomp/parsecmm.mly | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile
index 09fb81f25..ee2b91578 100644
--- a/testsuite/tests/asmcomp/Makefile
+++ b/testsuite/tests/asmcomp/Makefile
@@ -27,7 +27,7 @@ OTHEROBJS=\
 
 OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo
 
-ADD_COMPFLAGS=$(INCLUDES) -g
+ADD_COMPFLAGS=$(INCLUDES) -w -40 -g
 
 default:
 	@if $(BYTECODE_ONLY) || [ -z "$(ASPP)" ]; then : ; else \
diff --git a/testsuite/tests/asmcomp/parsecmm.mly b/testsuite/tests/asmcomp/parsecmm.mly
index 553ab66bc..5d19f3d4a 100644
--- a/testsuite/tests/asmcomp/parsecmm.mly
+++ b/testsuite/tests/asmcomp/parsecmm.mly
@@ -210,11 +210,11 @@ expr:
   | LPAREN FLOATAREF expr expr RPAREN
       { Cop(Cload Double_u, [access_array $3 $4 Arch.size_float]) }
   | LPAREN ADDRASET expr expr expr RPAREN
-      { Cop(Cstore Word_val, [access_array $3 $4 Arch.size_addr; $5]) }
+      { Cop(Cstore (Word_val, Assignment), [access_array $3 $4 Arch.size_addr; $5]) }
   | LPAREN INTASET expr expr expr RPAREN
-      { Cop(Cstore Word_int, [access_array $3 $4 Arch.size_int; $5]) }
+      { Cop(Cstore (Word_int, Assignment), [access_array $3 $4 Arch.size_int; $5]) }
   | LPAREN FLOATASET expr expr expr RPAREN
-      { Cop(Cstore Double_u, [access_array $3 $4 Arch.size_float; $5]) }
+      { Cop(Cstore (Double_u, Assignment), [access_array $3 $4 Arch.size_float; $5]) }
 ;
 exprlist:
     exprlist expr               { $2 :: $1 }
@@ -254,7 +254,7 @@ unaryop:
   | ABSF                        { Cabsf }
 ;
 binaryop:
-    STORE chunk                 { Cstore $2 }
+    STORE chunk                 { Cstore ($2, Assignment) }
   | ADDI                        { Caddi }
   | SUBI                        { Csubi }
   | MULI                        { Cmuli }