[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-1-5-g3034a75

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 3034a758df19d6ea684e2ecb40d1c2f7b9b9002d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 20 22:36:34 2012 +0200

    Fix symbol mangling in asmcomp tests on kfreebsd-i386 and sparc

diff --git a/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch b/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch
deleted file mode 100644
index 4831499..0000000
--- a/debian/patches/0012-Fix-asmcomp-tests-on-Hurd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Pino Toscano <pino at debian.org>
-Date: Tue, 27 Mar 2012 11:41:02 +0200
-Subject: Fix asmcomp tests on Hurd
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661716
-Author: Pino Toscano <pino at debian.org>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- testsuite/tests/asmcomp/i386.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S
-index fdda4de..54e37a6 100644
---- a/testsuite/tests/asmcomp/i386.S
-+++ b/testsuite/tests/asmcomp/i386.S
-@@ -15,7 +15,7 @@
- /* 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_gnu)
- #define G(x) x
- #define FUNCTION_ALIGN 16
- #else
--- 
diff --git a/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch b/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
new file mode 100644
index 0000000..3487eef
--- /dev/null
+++ b/debian/patches/0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
@@ -0,0 +1,41 @@
+From: Pino Toscano <pino at 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 at debian.org>.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661716
+Signed-off-by: Stephane Glondu <steph at 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
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3df69c3..3e1391f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,7 @@
 0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch
 0010-Properly-initialize-executable-name-in-caml_startup_.patch
 0011-Embed-bytecode-in-C-object-when-using-custom.patch
-0012-Fix-asmcomp-tests-on-Hurd.patch
+0012-Fix-symbol-mangling-in-asmcomp-tests-on-i386-and-spa.patch
 0013-Fix-testsuite-on-bytecode-architectures.patch
 0014-ocamlopt-fix-on-powerpc.patch
 0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch

-- 
OCaml packaging