summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--asmrun/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changes b/Changes
index 169b9479f..2abfe9720 100644
--- a/Changes
+++ b/Changes
@@ -210,6 +210,8 @@ Bug fixes:
(Alain Frisch and Leo White)
- PR#6267: more information printed by "bt" command of ocamldebug
(Josh Watzman)
+- PR#6268: -DMODEL_$(MODEL) not passed when building asmrun/arm.p.o
+ (Peter Michael Green)
- PR#6273: fix Sys.file_exists on large files (Win32)
(Christoph Bauer)
- PR#6275: Soundness bug related to type constraints
diff --git a/asmrun/Makefile b/asmrun/Makefile
index 6c6dd98a8..63ff80c68 100644
--- a/asmrun/Makefile
+++ b/asmrun/Makefile
@@ -183,7 +183,7 @@ clean::
exit 2; }
.S.p.o:
- $(ASPP) -DSYS_$(SYSTEM) $(ASPPPROFFLAGS) -o $*.p.o $*.S
+ $(ASPP) -DSYS_$(SYSTEM) -DMODEL_$(MODEL) $(ASPPPROFFLAGS) -o $*.p.o $*.S
.c.d.o:
ln -s -f $*.c $*.d.c