From: Pino Toscano <pino@debian.org>
Date: Tue, 27 Mar 2012 11:41:02 +0200
Subject: Fix symbol mangling in asmcomp tests on *-i386 and sparc

Based on a patch by Pino Toscano <pino@debian.org>.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661716
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
 testsuite/tests/asmcomp/i386.S  |    3 ++-
 testsuite/tests/asmcomp/sparc.S |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S
index fdda4de..c2510c8 100644
--- a/testsuite/tests/asmcomp/i386.S
+++ b/testsuite/tests/asmcomp/i386.S
@@ -15,7 +15,8 @@
 /* Linux with ELF binaries does not prefix identifiers with _.
    Linux with a.out binaries, FreeBSD, and NextStep do. */
 
-#ifdef SYS_linux_elf
+#if defined(SYS_linux_elf) || defined(SYS_bsd_elf) \
+ || defined(SYS_solaris) || defined(SYS_beos) || defined(SYS_gnu)
 #define G(x) x
 #define FUNCTION_ALIGN 16
 #else
diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S
index 7d17548..aeacaaf 100644
--- a/testsuite/tests/asmcomp/sparc.S
+++ b/testsuite/tests/asmcomp/sparc.S
@@ -12,7 +12,7 @@
 
 /* $Id: sparc.S 11156 2011-07-27 14:17:02Z doligez $ */
 
-#ifndef SYS_solaris
+#if defined(SYS_solaris) || defined(SYS_elf)
 #define Call_gen_code _call_gen_code
 #define Caml_c_call _caml_c_call
 #else
-- 

From: Stephane Glondu <steph@glondu.net>
Date: Wed, 20 Jun 2012 13:50:25 +0200
Subject: Fix testsuite on bytecode architectures

---
 testsuite/makefiles/Makefile.one     |    3 ++-
 testsuite/tests/lib-scanf-2/Makefile |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one
index 7b25216..edb6ead 100644
--- a/testsuite/makefiles/Makefile.one
+++ b/testsuite/makefiles/Makefile.one
@@ -20,7 +20,7 @@ ADD_CFLAGS+=$(CUSTOM_FLAG)
 
 default: compile run
 
-compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) $(MAIN_MODULE).cmo $(MAIN_MODULE).cmx
+compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo
 	@for file in $(C_FILES); do \
 	  $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(TOPDIR)/byterun $$file.c; \
 	done;
@@ -28,6 +28,7 @@ compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) $(MAIN_MODULE).cmo $(MAIN_MODULE)
 	@$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) $(MAIN_MODULE).cmo
 	@if [ -z "$(BYTECODE_ONLY)" ]; then \
 	  rm -f program.native program.native.exe; \
+	  $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \
 	  $(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) $(CMXA_FILES) $(CMX_FILES) $(ADD_CMX_FILES) $(MAIN_MODULE).cmx; \
 	fi
 
diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile
index 216b396..7362fad 100644
--- a/testsuite/tests/lib-scanf-2/Makefile
+++ b/testsuite/tests/lib-scanf-2/Makefile
@@ -2,10 +2,11 @@ BASEDIR=../..
 
 default: compile run
 
-compile: tscanf2_io.cmo tscanf2_io.cmx
+compile: tscanf2_io.cmo
 	@$(OCAMLC) unix.cma tscanf2_io.cmo -o master.byte tscanf2_master.ml
 	@$(OCAMLC) tscanf2_io.cmo -o slave.byte tscanf2_slave.ml
 	@if [ -z "$(BYTECODE_ONLY)" ]; then \
+	  $(MAKE) tscanf2_io.cmx; \
 	  $(OCAMLOPT) unix.cmxa tscanf2_io.cmx -o master.native tscanf2_master.ml; \
 	  $(OCAMLOPT) tscanf2_io.cmx -o slave.native tscanf2_slave.ml; \
 	fi
-- 

From: Stephane Glondu <steph@glondu.net>
Date: Wed, 20 Jun 2012 21:58:35 +0200
Subject: ocamlopt fix on powerpc

Origin: http://caml.inria.fr/cgi-bin/viewvc.cgi?view=revision&revision=12583
---
 asmcomp/power/arch.ml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asmcomp/power/arch.ml b/asmcomp/power/arch.ml
index 696073e..239390c 100644
--- a/asmcomp/power/arch.ml
+++ b/asmcomp/power/arch.ml
@@ -48,7 +48,7 @@ let size_float = 8
 
 (* Behavior of division *)
 
-let division_crashes_on_overflow = false
+let division_crashes_on_overflow = true
 
 (* Operations on addressing modes *)
 
-- 

From: Stephane Glondu <steph@glondu.net>
Date: Wed, 20 Jun 2012 22:00:46 +0200
Subject: Move power.o rule in asmcomp test after definition of $(SYSTEM)

---
 testsuite/tests/asmcomp/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile
index fb1af49..c4d1aa0 100644
--- a/testsuite/tests/asmcomp/Makefile
+++ b/testsuite/tests/asmcomp/Makefile
@@ -141,11 +141,11 @@ clean: defaultclean
 	@rm -f parsecmm.ml parsecmm.mli lexcmm.ml
 	@rm -f $(CASES:=.s)
 
-power.o: power-$(SYSTEM).o
-	@cp power-$(SYSTEM).o power.o
-
 promote:
 
 include $(BASEDIR)/makefiles/Makefile.common
 
+power.o: power-$(SYSTEM).o
+	@cp power-$(SYSTEM).o power.o
+
 arch: $(ARCH).o
--