--- peigen.c Tue May 16 06:10:00 2000 +++ E:\projects\binutils\src\bfd\peigen.c Tue Sep 19 15:27:13 2000 @@ -469,10 +469,15 @@ _bfd_pei_swap_aouthdr_in (abfd, aouthdr_ int idx; for (idx=0; idx < 16; idx++) { - a->DataDirectory[idx].VirtualAddress = - bfd_h_get_32 (abfd, (bfd_byte *)src->DataDirectory[idx][0]); - a->DataDirectory[idx].Size = - bfd_h_get_32 (abfd, (bfd_byte *)src->DataDirectory[idx][1]); + /* If data directory is empty, rva also should be 0 */ + + if ((a->DataDirectory[idx].Size = + bfd_h_get_32 (abfd, (bfd_byte *)src->DataDirectory[idx][1]))) + { + a->DataDirectory[idx].VirtualAddress = + bfd_h_get_32 (abfd, (bfd_byte *)src->DataDirectory[idx][0]); + } + else a->DataDirectory[idx].VirtualAddress = 0; } } @@ -527,9 +532,12 @@ add_data_entry (abfd, aout, idx, name, b && (coff_section_data (abfd, sec) != NULL) && (pei_section_data (abfd, sec) != NULL)) { - aout->DataDirectory[idx].VirtualAddress = (sec->vma - base) & 0xffffffff; - aout->DataDirectory[idx].Size = pei_section_data (abfd, sec)->virt_size; - sec->flags |= SEC_DATA; + /* If data directory is empty, rva also should be 0 */ + if ((aout->DataDirectory[idx].Size = pei_section_data (abfd, sec)->virt_size)) + { + aout->DataDirectory[idx].VirtualAddress = (sec->vma - base) & 0xffffffff; + sec->flags |= SEC_DATA; + } } }