From 8721dc4e896d80cc389be30e3862c317b91975dc Mon Sep 17 00:00:00 2001
From: KC Sivaramakrishnan <kc@kcsrk.info>
Date: Wed, 26 Jun 2019 11:23:22 +0530
Subject: [PATCH] Remove inclusion of config.h from the files that generate
 domain state table.

---
 runtime/amd64.S               | 9 +++------
 runtime/arm.S                 | 3 ---
 runtime/arm64.S               | 3 ---
 runtime/caml/domain_state.tbl | 2 +-
 runtime/i386.S                | 3 ---
 runtime/power.S               | 3 ---
 runtime/s390x.S               | 3 ---
 utils/domainstate.ml.c        | 3 ---
 8 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/runtime/amd64.S b/runtime/amd64.S
index 993a9d8c5..ee1c4e069 100644
--- a/runtime/amd64.S
+++ b/runtime/amd64.S
@@ -112,9 +112,6 @@
 
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
@@ -539,15 +536,15 @@ FUNCTION(G(caml_c_call))
 CFI_STARTPROC
 LBL(caml_c_call):
     /* Record lowest stack address and return address */
-        popq    %r12; CFI_ADJUST(-8)
-        movq    %r12, Caml_state(last_return_address)
+        popq    Caml_state(last_return_address); CFI_ADJUST(-8)
         movq    %rsp, Caml_state(bottom_of_stack)
+    /* equivalent to pushing last return address */
+        subq    $8, %rsp; CFI_ADJUST(8)
 #ifdef WITH_SPACETIME
     /* Record the trie node hole pointer that corresponds to
        [Caml_state->last_return_address] */
         STORE_VAR(%r13, caml_spacetime_trie_node_ptr)
 #endif
-        subq    $8, %rsp; CFI_ADJUST(8) /* equivalent to pushq %r12 */
     /* Touch the stack to trigger a recoverable segfault
        if insufficient space remains */
         subq    $(STACK_PROBE_SIZE), %rsp; CFI_ADJUST(STACK_PROBE_SIZE);
diff --git a/runtime/arm.S b/runtime/arm.S
index f2007e0de..ba170ba6b 100644
--- a/runtime/arm.S
+++ b/runtime/arm.S
@@ -122,9 +122,6 @@ caml_hot__code_begin:
 caml_hot__code_end:
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
diff --git a/runtime/arm64.S b/runtime/arm64.S
index 3218fb500..f35d83cc3 100644
--- a/runtime/arm64.S
+++ b/runtime/arm64.S
@@ -50,9 +50,6 @@
 #define CFI_OFFSET(r,n)
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
diff --git a/runtime/caml/domain_state.tbl b/runtime/caml/domain_state.tbl
index 37e38188f..c522d722c 100644
--- a/runtime/caml/domain_state.tbl
+++ b/runtime/caml/domain_state.tbl
@@ -14,13 +14,13 @@
 /*                                                                        */
 /**************************************************************************/
 
+DOMAIN_STATE(value*, young_ptr)
 DOMAIN_STATE(value*, young_limit)
 /* Minor heap limit. See minor_gc.c. */
 
 DOMAIN_STATE(char*, exception_pointer)
 /* Exception pointer that points into the current stack */
 
-DOMAIN_STATE(value*, young_ptr)
 DOMAIN_STATE(void*, young_base)
 DOMAIN_STATE(value*, young_start)
 DOMAIN_STATE(value*, young_end)
diff --git a/runtime/i386.S b/runtime/i386.S
index 9093f863b..71cf6ffff 100644
--- a/runtime/i386.S
+++ b/runtime/i386.S
@@ -82,9 +82,6 @@
 #define STACK_PROBE_SIZE 16384
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
diff --git a/runtime/power.S b/runtime/power.S
index 0a2bb6754..94983a6e6 100644
--- a/runtime/power.S
+++ b/runtime/power.S
@@ -142,9 +142,6 @@
         ld      reg, LSYMB(glob)@toc(2)
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
diff --git a/runtime/s390x.S b/runtime/s390x.S
index dac391df5..0ae3f82ae 100644
--- a/runtime/s390x.S
+++ b/runtime/s390x.S
@@ -25,9 +25,6 @@
         larl    reg, glob
 #endif
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "../runtime/caml/config.h"
-
         .set    domain_curr_field, 0
 #define DOMAIN_STATE(c_type, name) \
         .equ    domain_field_caml_##name, domain_curr_field ; \
diff --git a/utils/domainstate.ml.c b/utils/domainstate.ml.c
index 2d8990ef8..7ece1ad85 100644
--- a/utils/domainstate.ml.c
+++ b/utils/domainstate.ml.c
@@ -14,9 +14,6 @@
 /*                                                                        */
 /**************************************************************************/
 
-#define CAML_CONFIG_H_NO_TYPEDEFS
-#include "config.h"
-
 type t =
 #define DOMAIN_STATE(type, name) | Domain_##name
 #include "domain_state.tbl"