espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-01 17:27:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

* dlltool.c (gen_exp_file): Revert 19990411 change.

Browse Source
This commit is contained in:
Richard Henderson
1999-06-02 12:37:48 +00:00
parent cd785be602
commit d8bcc1ac10
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
binutils/ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jun 2 12:34:36 1999 Richard Henderson <rth@cygnus.com>
* dlltool.c (gen_exp_file): Revert 19990411 change.
Mon May 31 09:56:22 1999 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> Mon May 31 09:56:22 1999 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* readelf.c (process_relocs): Determine type of reloc from * readelf.c (process_relocs): Determine type of reloc from

21
binutils/dlltool.c
View File

@ -350,10 +350,6 @@ static int verbose;
static FILE *output_def; static FILE *output_def;
static FILE *base_file; static FILE *base_file;
#ifdef DLLTOOL_BEOS
static const char *mname = "beos";
#endif
#ifdef DLLTOOL_ARM #ifdef DLLTOOL_ARM
static const char *mname = "arm"; static const char *mname = "arm";
#endif #endif
@ -1874,8 +1870,6 @@ gen_exp_file ()
int src; int src;
int dst = 0; int dst = 0;
int last = -1; int last = -1;
int totsize = 0;
qsort (copy, num_entries, sizeof (long), sfunc); qsort (copy, num_entries, sizeof (long), sfunc);
/* Delete duplcates */ /* Delete duplcates */
for (src = 0; src < num_entries; src++) for (src = 0; src < num_entries; src++)
@ -1889,31 +1883,18 @@ gen_exp_file ()
on_page = 0; on_page = 0;
for (j = 0; j < num_entries; j++) for (j = 0; j < num_entries; j++)
{ {
totsize += 2;
addr = copy[j]; addr = copy[j];
if ((addr & PAGE_MASK) != page_addr) if ((addr & PAGE_MASK) != page_addr)
{ {
totsize += 8 + (on_page & 1)*2;
flush_page (f, need, page_addr, on_page); flush_page (f, need, page_addr, on_page);
on_page = 0; on_page = 0;
page_addr = addr & PAGE_MASK; page_addr = addr & PAGE_MASK;
} }
need[on_page++] = addr; need[on_page++] = addr;
} }
/* Pad the section to an even 32-byte boundary. This will make
the BeOS loader much happier, and shouldn't matter for other
OSes. */
while ((totsize + 8 + (on_page & 1)*2) % 32 != 0)
{
/* 0x0000 is an absolute relocation that should be ignored. */
need[on_page++] = 0x0000;
totsize += 2;
}
flush_page (f, need, page_addr, on_page); flush_page (f, need, page_addr, on_page);
/* fprintf (f, "\t%s\t0,0\t%s End\n", ASM_LONG, ASM_C);*/ /* fprintf (f, "\t%s\t0,0\t%s End\n", ASM_LONG, ASM_C);*/
} }
} }