From 6aa4f5169f0f6d6627f56196ddd9df671a0560ad Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 29 Jun 2000 23:10:08 +0000 Subject: Fix previous delta so that it is only used for TE_GO32 and not !TE_PE. --- gas/ChangeLog | 2 +- gas/write.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 0a8aa03..c5d81da 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -6,7 +6,7 @@ Thu Jun 29 21:30:00 2000 Hans-Peter Nilsson 2000-06-29 Mark Elbrecht * write.c (set_segment_vma): New: Set vma and lma for a segment. - (write_object_file) [BFD_ASSEMBLER && OBJ_COFF && !TE_PE]: Use it. + (write_object_file) [BFD_ASSEMBLER && OBJ_COFF && TE_GO32]: Use it. 2000-06-27 Aldy Hernandez diff --git a/gas/write.c b/gas/write.c index 1f11f35..29904e1 100644 --- a/gas/write.c +++ b/gas/write.c @@ -132,7 +132,7 @@ static void cvt_frag_to_fill PARAMS ((object_headers *, segT, fragS *)); static void remove_subsegs PARAMS ((frchainS *, int, fragS **, fragS **)); static void relax_and_size_all_segments PARAMS ((void)); #endif -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && !defined (TE_PE) +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) static void set_segment_vma PARAMS ((bfd *, asection *, PTR)); #endif @@ -1351,7 +1351,7 @@ set_symtab () } #endif -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && !defined (TE_PE) +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) static void set_segment_vma (abfd, sec, xxx) bfd *abfd; @@ -1497,10 +1497,11 @@ write_object_file () relax_and_size_all_segments (); #endif /* BFD_ASSEMBLER */ -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && !defined (TE_PE) +#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) /* Now that the segments have their final sizes, run through the - sections and set their vma and lma. The !BFD_ASSEMBLER case takes - care of this in write_object_file in config/obj-coff.c. */ + sections and set their vma and lma. !BFD gas sets them, and BFD gas + should too. Currently, only DJGPP uses this code, but other + COFF targets may need to execute this too. */ bfd_map_over_sections (stdoutput, set_segment_vma, (char *) 0); #endif -- cgit v1.1