From d24382e8f87688cf1f452ac69fdc98251817adb9 Mon Sep 17 00:00:00 2001 From: sergei Date: Sun, 18 Jan 2015 17:04:53 +0000 Subject: [PATCH] * x86 AT&T writer: never ever drop "@GOTPCREL" relocation, because it results in corrupted code (at least, "mov foo@GOTPCREL(%rip),%reg" must change to "lea foo(%rip),%reg" to remain equivalent, but this must be handled elsewhere anyway. Assembler writer should just write generated code as is). * Added internal errors on some impossible types of references. git-svn-id: trunk@29506 - --- compiler/x86/agx86att.pas | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/compiler/x86/agx86att.pas b/compiler/x86/agx86att.pas index be19c03586..ab2970b762 100644 --- a/compiler/x86/agx86att.pas +++ b/compiler/x86/agx86att.pas @@ -163,18 +163,19 @@ interface if assigned(relsymbol) then owner.AsmWrite('-'+relsymbol.name); if ref.refaddr=addr_pic then -{$ifdef x86_64} begin - { local symbols don't have to (and in case of Mac OS X: cannot) - be accessed via the GOT - } - if not assigned(ref.symbol) or - (ref.symbol.bind<>AB_LOCAL) then - owner.AsmWrite('@GOTPCREL'); - end; + { @GOT and @GOTPCREL references are only allowed for symbol alone, + indexing, relsymbol or offset cannot be present. } + if assigned(relsymbol) or (offset<>0) or (index<>NR_NO) then + InternalError(2015011801); +{$ifdef x86_64} + if (base<>NR_RIP) then + InternalError(2015011802); + owner.AsmWrite('@GOTPCREL'); {$else x86_64} - owner.AsmWrite('@GOT'); + owner.AsmWrite('@GOT'); {$endif x86_64} + end; if offset<0 then owner.AsmWrite(tostr(offset)) else