orctarget: Get rid of the API/ABI changes at 036e74bHEADmain

Given that those changes haven't been released, and the orctarget
interface is no longer exported, we don't need that anymore

Part-of: <https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/237>

4 files changed, 5 insertions, 13 deletions

diff --git a/orc/orc.c b/orc/orc.c
index 0d20cf9..d0a3faa 100644
--- a/orc/orc.c
+++ b/orc/orc.c
@@ -46,11 +46,6 @@ orc_init (void)
     if (!inited) {
       /* Validate extensions for API/ABI compatibility */
       ORC_ASSERT(sizeof(OrcExecutor) == sizeof(OrcExecutorAlt));
-      {
-        OrcTarget *t = NULL;
-        ORC_ASSERT(sizeof(t->extra.padding) >= sizeof(t->extra.data));
-      }
-
       _orc_debug_init();
       _orc_compiler_init();
       orc_opcode_init();
diff --git a/orc/orccompiler.c b/orc/orccompiler.c
index ee92c87..cfeb102 100644
--- a/orc/orccompiler.c
+++ b/orc/orccompiler.c
@@ -1636,7 +1636,7 @@ orc_compiler_try_get_constant_full (OrcCompiler *c, OrcConstant *cnst)
 
   /* Search for a constant equal to the requested */
   for (i = 0; i < c->n_constants; i++) {
-    if (orc_constant_is_equal (cnst, &c->constants[i], c->target->extra.data.register_size)) {
+    if (orc_constant_is_equal (cnst, &c->constants[i], c->target->register_size)) {
       ORC_DEBUG ("Same constant found at %d, reusing register %d", i,
           c->constants[i].alloc_reg);
       c->constants[i].use_count++;
diff --git a/orc/orcinternal.h b/orc/orcinternal.h
index 642a78f..1b1f7c5 100644
--- a/orc/orcinternal.h
+++ b/orc/orcinternal.h
@@ -162,12 +162,9 @@ struct _OrcTarget {
   void (*load_constant_long)(OrcCompiler *compiler, int reg,
       OrcConstant *constant);
   void *target_data;
-  union {
-    void *padding[4];
-    struct {
-      int register_size;
-    } data;
-  } extra;
+  void *padding[4];
+  /* Until here is for ABI compatibility for 0.4.41 */
+  int register_size;
 };
 
 /* The function prototypes need to be visible to orc.c */
diff --git a/orc/orcprogram-x86.c b/orc/orcprogram-x86.c
index 6cffc3b..9a2705b 100644
--- a/orc/orcprogram-x86.c
+++ b/orc/orcprogram-x86.c
@@ -1258,6 +1258,6 @@ orc_x86_register_extension (OrcTarget *t, OrcX86Target *x86t)
   t->load_constant_long = x86t->load_constant_long;
   t->flush_cache = orc_x86_flush_cache;
   t->target_data = x86t;
-  t->extra.data.register_size = x86t->register_size;
+  t->register_size = x86t->register_size;
   orc_target_register (t);
 }