Avoid multiply-defined symbols that lead to link errors such as:

  ld: libcamlrund.a(backtrace_bd.o):/tmp/guix-build-ocaml-4.09.0.drv-0/ocaml-4.09.0/runtime/backtrace.c:31: multiple definition of `caml_debug_info'; libcamlrund.a(backtrace_byt_bd.o):/tmp/guix-build-ocaml-4.09.0.drv-0/ocaml-4.09.0/runtime/backtrace_byt.c:47: first defined here

diff --git a/runtime/backtrace.c b/runtime/backtrace.c
index a3c2c08..f57c81c 100644
--- a/runtime/backtrace.c
+++ b/runtime/backtrace.c
@@ -28,7 +28,7 @@
 #include "caml/fail.h"
 
 /* The table of debug information fragments */
-struct ext_table caml_debug_info;
+static struct ext_table caml_debug_info;
 
 CAMLexport int32_t caml_backtrace_active = 0;
 CAMLexport int32_t caml_backtrace_pos = 0;
diff --git a/runtime/backtrace_byt.c b/runtime/backtrace_byt.c
index b913dac..b5ec926 100644
--- a/runtime/backtrace_byt.c
+++ b/runtime/backtrace_byt.c
@@ -44,7 +44,7 @@
 #include "caml/backtrace_prim.h"
 
 /* The table of debug information fragments */
-struct ext_table caml_debug_info;
+static struct ext_table caml_debug_info;
 
 CAMLexport char_os * caml_cds_file = NULL;
 
diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c
index b4e6bc4..7eca5fa 100644
--- a/runtime/startup_nat.c
+++ b/runtime/startup_nat.c
@@ -44,6 +44,5 @@
 #endif
 
 extern int caml_parser_trace;
-CAMLexport header_t caml_atom_table[256];
 char * caml_code_area_start, * caml_code_area_end;
 struct ext_table caml_code_fragments_table;
uix/commit/gnu/packages/patches/bsd-games-dont-install-empty-files.patch?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>commit</a><a href='/guix/diff/gnu/packages/patches/bsd-games-dont-install-empty-files.patch?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/bsd-games-dont-install-empty-files.patch'>
<input type='hidden' name='id' value='1623e6023b9b2cd3dbcb663404067717ba6445f1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>root</a>/<a href='/guix/log/gnu?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>gnu</a>/<a href='/guix/log/gnu/packages?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>patches</a>/<a href='/guix/log/gnu/packages/patches/bsd-games-dont-install-empty-files.patch?id=1623e6023b9b2cd3dbcb663404067717ba6445f1'>bsd-games-dont-install-empty-files.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/bsd-games-dont-install-empty-files.patch?id=1623e6023b9b2cd3dbcb663404067717ba6445f1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
ommit/gnu/packages/patches/java-simple-xml-fix-tests.patch?id=3c274149688472cca4f506483b82d0b7865481b3'>gnu: java-simple-xml: Fix java8 test failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/javas-simple-xml-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/java.scm (java-simple-xml)[source](patches): Add it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Gábor Boskovits</td></tr>