From b317bce8433de5e318d5dd4ed312790611831f1b Mon Sep 17 00:00:00 2001 From: John Polstra Date: Tue, 7 Apr 1998 17:10:01 +0000 Subject: [PATCH] Fix a bug which clobbered linker set symbols that had forward references. With -O3, egcs generates such forward references. PR: gnu/6055 Reviewed by: jdp Submitted by: Dmitrij Tejblum in slightly different form --- gnu/usr.bin/as/config/obj-aout.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/usr.bin/as/config/obj-aout.c b/gnu/usr.bin/as/config/obj-aout.c index 8aaa7d726f9..860d90461b7 100644 --- a/gnu/usr.bin/as/config/obj-aout.c +++ b/gnu/usr.bin/as/config/obj-aout.c @@ -469,8 +469,24 @@ object_headers *headers; /* JF deal with forward references first... */ for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next(symbolP)) { if (symbolP->sy_forward && symbolP->sy_forward != symbolP) { - S_SET_SEGMENT(symbolP, - S_GET_SEGMENT(symbolP->sy_forward)); + switch (S_GET_TYPE(symbolP)) { + + case N_SETA: + case N_SETT: + case N_SETD: + case N_SETB: + /* + * Don't change the segments of SET symbols, + * because that would turn them into regular + * symbols. + */ + break; + + default: + S_SET_SEGMENT(symbolP, + S_GET_SEGMENT(symbolP->sy_forward)); + break; + } S_SET_VALUE(symbolP, S_GET_VALUE(symbolP) + S_GET_VALUE(symbolP->sy_forward) + symbolP->sy_forward->sy_frag->fr_address);