darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
David Henkel-Wallace 1991-04-19 18:03:10 +00:00
parent c1ace5b596
commit ab01cf22f0
1 changed files with 53 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
binutils/ar.c
View file

@ -72,6 +72,27 @@ enum pos {
pos_default, pos_before, pos_after, pos_end pos_default, pos_before, pos_after, pos_end
} postype = pos_default; } postype = pos_default;
#ifdef GNU960
char *default_target;
void
gnu960_verify_target(abfd)
bfd *abfd;
{
if ( abfd->format == bfd_unknown ){
bfd_check_format(abfd, bfd_object);
/* Don't really care if it's an object --
* just want to get the correct xvec.
*/
}
if ( !BFD_COFF_FILE_P(abfd) ){
fatal( "'%s' not a COFF file -- operation aborted",
abfd->filename );
}
}
#endif
boolean operation_alters_arch = false; boolean operation_alters_arch = false;
@ -94,8 +115,13 @@ main(argc, argv)
char **files; char **files;
char *inarch_filename; char *inarch_filename;
char *temp; char *temp;
program_name = argv[0];
#ifdef GNU960
check_v960( argc, argv );
default_target = bfd_make_targ_name(BFD_COFF_FORMAT,HOST_BYTE_ORDER_BIG_P);
#endif
program_name = argv[0];
temp = strrchr(program_name, '/'); temp = strrchr(program_name, '/');
if (temp == (char *) NULL) if (temp == (char *) NULL)
@ -226,9 +252,9 @@ main(argc, argv)
*/ */
#if 0 #if 0
if (operation == replace && inarch == &bogus_archive) { if (operation == replace && inarch == &bogus_archive) {
silent_create = 1; silent_create = 1;
do_quick_append(inarch_filename, 0); do_quick_append(inarch_filename, 0);
open_inarch(inarch_filename); open_inarch(inarch_filename);
} }
#endif #endif
switch (operation) { switch (operation) {
@ -308,7 +334,11 @@ open_inarch(archive_filename)
} }
else { else {
#ifdef GNU960
inarch = bfd_openr(archive_filename, default_target);
#else
inarch = bfd_openr(archive_filename, NULL); inarch = bfd_openr(archive_filename, NULL);
#endif
if (inarch == NULL) { if (inarch == NULL) {
bloser: bloser:
bfd_perror(archive_filename); bfd_perror(archive_filename);
@ -317,6 +347,9 @@ open_inarch(archive_filename)
if (bfd_check_format(inarch, bfd_archive) != true) if (bfd_check_format(inarch, bfd_archive) != true)
fatal("File %s is not an archive.", archive_filename); fatal("File %s is not an archive.", archive_filename);
#ifdef GNU960
gnu960_verify_target(inarch); /* Exits on failure */
#endif
last_one = &(inarch->next); last_one = &(inarch->next);
/* Read all the contents right away, regardless. */ /* Read all the contents right away, regardless. */
for (next_one = bfd_openr_next_archived_file(inarch, NULL); for (next_one = bfd_openr_next_archived_file(inarch, NULL);
@ -478,6 +511,7 @@ extract_file(abfd)
exit(1); exit(1);
} }
} }
/* no need to byte-swap; the two formats are presumably compatible(!) */
fwrite(cbuf, 1, nread, ostream); fwrite(cbuf, 1, nread, ostream);
ncopied += tocopy; ncopied += tocopy;
} }
@ -539,7 +573,11 @@ do_quick_append(archive_filename, files_to_append)
} }
/* bletch */ /* bletch */
#ifdef GNU960
temp = bfd_openr(archive_filename, default_target);
#else
temp = bfd_openr(archive_filename, NULL); temp = bfd_openr(archive_filename, NULL);
#endif
if (temp == NULL) { if (temp == NULL) {
bfd_perror(archive_filename); bfd_perror(archive_filename);
exit(1); exit(1);
@ -547,6 +585,9 @@ do_quick_append(archive_filename, files_to_append)
if (newfile == false) { if (newfile == false) {
if (bfd_check_format(temp, bfd_archive) != true) if (bfd_check_format(temp, bfd_archive) != true)
fatal("File %s is not an archive.", archive_filename); fatal("File %s is not an archive.", archive_filename);
#ifdef GNU960
gnu960_verify_target(temp); /* Exits on failure */
#endif
} }
else { else {
fwrite(ARMAG, 1, SARMAG, ofile); fwrite(ARMAG, 1, SARMAG, ofile);
@ -824,6 +865,9 @@ replace_members(files_to_move)
fprintf(stderr, "Can't open file %s\n", *files_to_move); fprintf(stderr, "Can't open file %s\n", *files_to_move);
exit(1); exit(1);
} }
#ifdef GNU960
gnu960_verify_target(*after_bfd); /* Exits on failure */
#endif
(*after_bfd)->next = temp; (*after_bfd)->next = temp;
if (verbose) { if (verbose) {
@ -844,6 +888,9 @@ replace_members(files_to_move)
fprintf(stderr, "Can't open file %s\n", *files_to_move); fprintf(stderr, "Can't open file %s\n", *files_to_move);
exit(1); exit(1);
} }
#ifdef GNU960
gnu960_verify_target(*after_bfd); /* Exits on failure */
#endif
if (verbose) { if (verbose) {
printf("c - %s\n", *files_to_move); printf("c - %s\n", *files_to_move);
} }
@ -868,3 +915,5 @@ ranlib_only(archname)
write_archive(); write_archive();
exit(0); exit(0);
} }