aboutsummaryrefslogtreecommitdiff
path: root/ld/ldlang.c
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-04-22 21:32:58 +0000
committerIan Lance Taylor <ian@airs.com>1996-04-22 21:32:58 +0000
commit6799c638e59e6861940dd4eec6c59f6466db1f69 (patch)
tree50617a4074558f081e996288cace442e9b30276d /ld/ldlang.c
parentaf50cd91709c17eea54401ee327ee421b8a8b985 (diff)
downloadgdb-6799c638e59e6861940dd4eec6c59f6466db1f69.zip
gdb-6799c638e59e6861940dd4eec6c59f6466db1f69.tar.gz
gdb-6799c638e59e6861940dd4eec6c59f6466db1f69.tar.bz2
* ldlang.c (lang_size_sections): If _cooked_size is not 0, then
don't clobber it when not relaxing. * ld.h (ld_config_type): Remove traditional_format field. * ldmain.c (main): Use link_info.traditional_format rather than config.traditional_format. * ldlang.c (ldlang_open_output): Likewise. * lexsup.c (parse_args): Likewise. * emultempl/aix.em (gld${EMULATION_NAME}_parse_args): Likewise. * mpw-eppcmac.c (gldppcmacos_parse_args): Likewise.
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r--ld/ldlang.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 3288fe1..f9e0e71 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1110,7 +1110,7 @@ ldlang_open_output (statement)
output_bfd->flags |= WP_TEXT;
else
output_bfd->flags &= ~WP_TEXT;
- if (config.traditional_format)
+ if (link_info.traditional_format)
output_bfd->flags |= BFD_TRADITIONAL_FORMAT;
else
output_bfd->flags &= ~BFD_TRADITIONAL_FORMAT;
@@ -2139,7 +2139,10 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
i = (*prev)->input_section.section;
if (! relax)
- i->_cooked_size = i->_raw_size;
+ {
+ if (i->_cooked_size == 0)
+ i->_cooked_size = i->_raw_size;
+ }
else
{
boolean again;