From 426318c599ead8ac9a9eaf458bc8058525dc8523 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 12 Feb 2003 23:21:08 +0000 Subject: [PATCH] * write.c (TC_FORCE_RELOCATION_SUB_SAME): Revert last change. * config/tc-s390.h (TC_FORCE_RELOCATION_SUB_SAME): Define. --- gas/ChangeLog | 5 +++++ gas/config/tc-s390.h | 4 ++++ gas/write.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 818eb8826f6..14677ab2317 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2003-02-13 Alan Modra + + * write.c (TC_FORCE_RELOCATION_SUB_SAME): Revert last change. + * config/tc-s390.h (TC_FORCE_RELOCATION_SUB_SAME): Define. + 2003-02-11 Uwe Stieber * configure.in: Add support for kaOS as cross build target system. diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h index e197029ae73..ed4d5506507 100644 --- a/gas/config/tc-s390.h +++ b/gas/config/tc-s390.h @@ -32,6 +32,10 @@ struct fix; #define TC_FORCE_RELOCATION(FIX) tc_s390_force_relocation(FIX) extern int tc_s390_force_relocation PARAMS ((struct fix *)); +/* Don't resolve foo@PLT-bar to offset@PLT. */ +#define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \ + (! SEG_NORMAL (SEG) || TC_FORCE_RELOCATION (FIX)) + #define tc_fix_adjustable(X) tc_s390_fix_adjustable(X) extern int tc_s390_fix_adjustable PARAMS ((struct fix *)); diff --git a/gas/write.c b/gas/write.c index 27fd0eb4121..f5db82e298d 100644 --- a/gas/write.c +++ b/gas/write.c @@ -51,7 +51,7 @@ #ifndef TC_FORCE_RELOCATION_SUB_SAME #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \ - (! SEG_NORMAL (SEG) || TC_FORCE_RELOCATION (FIX)) + (! SEG_NORMAL (SEG)) #endif #ifndef TC_FORCE_RELOCATION_SUB_ABS -- 2.30.2