64bit: Fix addends > 32 bits

If a symbolic reference is offsetted by a constant > 32bit
the backends can't deal with that, so don't construct such
values.
This commit is contained in:
Michael Matz
2016-10-09 00:44:22 +02:00
parent a2a596e767
commit 235711f3d3
3 changed files with 27 additions and 2 deletions

View File

@ -2429,6 +2429,19 @@ void getmyaddress(void)
void getmyaddress(void)
{
printf("in getmyaddress\n");
}
#ifdef __LP64__
long __pa_symbol(void)
{
/* This 64bit constant was handled incorrectly, it was used as addend
(which can hold 64bit just fine) in connection with a symbol,
and TCC generates wrong code for that (displacements are 32bit only).
This effectively is "+ 0x80000000", and if addresses of globals
are below 2GB the result should be a number without high 32 bits set. */
return ((long)(((unsigned long)(&rel1))) - (0xffffffff80000000UL));
}
#endif
unsigned long theaddress = (unsigned long)getmyaddress;
@ -2436,6 +2449,9 @@ void relocation_test(void)
{
void (*fptr)(void) = (void (*)(void))theaddress;
printf("*rel1=%d\n", *rel1);
printf("*rel2=%d\n", *rel2);
fptr();
#ifdef __LP64__
printf("pa_symbol=0x%lx\n", __pa_symbol() >> 63);
#endif
}