OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When the assembler reports that the input and output are the same, report the file names involved, in order to help debugging. Also do not equate two files are the same if the have the same inode value but reside on different file systems.

Browse Source 
* as.c (main): Improve check for input file matching output file.
This commit is contained in:
Robert Yang 2018-08-14 12:22:35 +01:00 committed by Nick Clifton
parent 08887f4a64
commit 2a50366ded
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gas/ChangeLog
View File

@ -1,3 +1,7 @@
2018-08-14 Robert Yang <liezhi.yang@windriver.com>
* as.c (main): Improve check for input file matching output file.
2018-08-11 H.J. Lu <hongjiu.lu@intel.com> 2018-08-11 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (cpu_arch): Add .cmov and .fxsr. * config/tc-i386.c (cpu_arch): Add .cmov and .fxsr.

23
gas/as.c
View File

@ -1259,14 +1259,27 @@ main (int argc, char ** argv)
{ {
struct stat sib; struct stat sib;
if (stat (argv[i], &sib) == 0) /* Check that the input file and output file are different. */
{ if (stat (argv[i], &sib) == 0
if (sib.st_ino == sob.st_ino && sib.st_ino != 0) && sib.st_ino == sob.st_ino
/* POSIX emulating systems may support stat() but if the
underlying file system does not support a file serial number
of some kind then they will return 0 for the inode. So
two files with an inode of 0 may not actually be the same.
On real POSIX systems no ordinary file will ever have an
inode of 0. */
&& sib.st_ino != 0
/* Different files may have the same inode number if they
reside on different devices, so check the st_dev field as
well. */
&& sib.st_dev == sob.st_dev)
{ {
const char *saved_out_file_name = out_file_name;
/* Don't let as_fatal remove the output file! */ /* Don't let as_fatal remove the output file! */
out_file_name = NULL; out_file_name = NULL;
as_fatal (_("The input and output files must be distinct")); as_fatal (_("The input '%s' and output '%s' files are the same"),
} argv[i], saved_out_file_name);
} }
} }
} }