Changeset 46558 in vbox

Timestamp:

Jun 14, 2013 1:24:32 PM (11 years ago)

Author:

vboxsync

Message:

IMP2 fixes

Location:

trunk

Files:

• include/iprt/asmdefs.mac (modified) (2 diffs)
• src/bldprogs/VBoxTpG.cpp (modified) (1 diff)

trunk/include/iprt/asmdefs.mac

@@ -139 +139 @@
  %endif
 %elifdef ASM_FORMAT_ELF
- %ifdef RT_ARCH_AMD64
-  %define IMP2(name)    qword [rel IMPNAME(name) wrt ..got]
- %else
-  %define IMP2(name)    IMPNAME(name) wrt ..plt
+ %ifdef PIC
+  %ifdef RT_ARCH_AMD64
+   %define IMP2(name)   qword [rel IMPNAME(name) wrt ..got]
+  %else
+   %define IMP2(name)   IMPNAME(name) wrt ..plt
+  %endif
  %endif
 %elifdef ASM_FORMAT_MACHO
@@ -150 +152 @@
   %define IMP2(name)    IMPNAME(name)
  %endif
-%else
- %ifdef RT_ARCH_AMD64
-  %define IMP2(name)    IMPNAME(name) wrt rip
- %else
-  %define IMP2(name)    IMPNAME(name)
- %endif
+%endif
+%ifndef IMP2
+ %define IMP2(name)     IMPNAME(name)
 %endif
 

trunk/src/bldprogs/VBoxTpG.cpp

@@ -851 +851 @@
                                 "        jmp     [rel %s wrt ..got]\n"
                                 : g_fProbeFnImported ?
-                                "        mov     rax, IMP2(%s)\n"
-                                "        jmp     rax\n"
+                                "        jmp     IMP2(%s)\n"
                                 :
                                 "        jmp     NAME(%s)\n"