From 50055880f9b197b9789f0812bd9190f18dcc87eb Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Sat, 21 Nov 2009 22:17:44 +0100
Subject: [PATCH] asm 32/64: replace (long)sym->next by sym->jnext

---
 i386-asm.c   | 6 +++---
 x86_64-asm.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/i386-asm.c b/i386-asm.c
index d360287b..4b1dd8f2 100644
--- a/i386-asm.c
+++ b/i386-asm.c
@@ -374,7 +374,7 @@ static void gen_disp32(ExprValue *pe)
                that the TCC compiler behaves differently here because
                it always outputs a relocation to ease (future) code
                elimination in the linker */
-            gen_le32(pe->v + (long)sym->next - ind - 4);
+            gen_le32(pe->v + sym->jnext - ind - 4);
         } else {
             greloc(cur_text_section, sym, ind, R_386_PC32);
             gen_le32(pe->v - 4);
@@ -397,7 +397,7 @@ static void gen_disp16(ExprValue *pe)
                that the TCC compiler behaves differently here because
                it always outputs a relocation to ease (future) code
                elimination in the linker */
-            gen_le16(pe->v + (long)sym->next - ind - 2);
+            gen_le16(pe->v + sym->jnext - ind - 2);
         } else {
             greloc(cur_text_section, sym, ind, R_386_PC16);
             gen_le16(pe->v - 2);
@@ -723,7 +723,7 @@ static void asm_opcode(TCCState *s1, int opcode)
             goto no_short_jump;
         if (sym->r != cur_text_section->sh_num)
             goto no_short_jump;
-        jmp_disp = ops[0].e.v + (long)sym->next - ind - 2;
+        jmp_disp = ops[0].e.v + sym->jnext - ind - 2;
         if (jmp_disp == (int8_t)jmp_disp) {
             /* OK to generate jump */
             is_short_jmp = 1;
diff --git a/x86_64-asm.c b/x86_64-asm.c
index 728ef1d1..2a894f8b 100644
--- a/x86_64-asm.c
+++ b/x86_64-asm.c
@@ -376,7 +376,7 @@ static void gen_disp32(ExprValue *pe)
                that the TCC compiler behaves differently here because
                it always outputs a relocation to ease (future) code
                elimination in the linker */
-            gen_le32(pe->v + (long)sym->next - ind - 4);
+            gen_le32(pe->v + sym->jnext - ind - 4);
         } else {
             greloc(cur_text_section, sym, ind, R_X86_64_PC32);
             gen_le32(pe->v - 4);
@@ -649,7 +649,7 @@ static void asm_opcode(TCCState *s1, int opcode)
             goto no_short_jump;
         if (sym->r != cur_text_section->sh_num)
             goto no_short_jump;
-        jmp_disp = ops[0].e.v + (long)sym->next - ind - 2;
+        jmp_disp = ops[0].e.v + sym->jnext - ind - 2;
         if (jmp_disp == (int8_t)jmp_disp) {
             /* OK to generate jump */
             is_short_jmp = 1;
-- 
2.11.4.GIT