[OE-core] [PATCH 1/1] binutils: Improve check for input file matching output file

[Robert Yang]

On 08/16/2018 02:14 PM, Robert Yang wrote:
> 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.
> 
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> ---
>   meta/recipes-devtools/binutils/binutils-2.31.inc   |  1 +
>   ...check-for-input-file-matching-output-file.patch | 59 ++++++++++++++++++++++
>   2 files changed, 60 insertions(+)
>   create mode 100644 meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
> 
> diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc b/meta/recipes-devtools/binutils/binutils-2.31.inc
> index 02d5bca..6603873 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.31.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.31.inc
> @@ -36,6 +36,7 @@ SRC_URI = "\
>        file://0014-Detect-64-bit-MIPS-targets.patch \
>        file://0015-sync-with-OE-libtool-changes.patch \
>        file://0016-add-i386pep-emulation-for-x86_64.patch \
> +     file://0017-improve-check-for-input-file-matching-output-file.patch \
>   "
>   S  = "${WORKDIR}/git"
>   
> diff --git a/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch b/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
> new file mode 100644
> index 0000000..6d8d8a3
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
> @@ -0,0 +1,59 @@
> +From 2a50366ded329bfb39d387253450c9d5302c3503 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang at windriver.com>
> +Date: Tue, 14 Aug 2018 12:22:35 +0100
> +Subject: [PATCH] as.c: Improve check for input file matching output file.
> +
> +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.
> +
> +Upstream-Status: Backport
> +
> +Robert Yang <liezhi.yang at windriver.com>

Sorry, here missed a SOB, I fixed it in the repo:

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

// Robert

> +---
> + gas/as.c      | 27 ++++++++++++++++++++-------
> + 2 files changed, 20 insertions(+), 7 deletions(-)
> +
> +diff --git a/gas/as.c b/gas/as.c
> +index b2a908a..3105d06 100644
> +--- a/gas/as.c
> ++++ b/gas/as.c
> +@@ -1259,14 +1259,27 @@ main (int argc, char ** argv)
> + 	{
> + 	  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
> ++	      && 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)
> + 	    {
> +-	      if (sib.st_ino == sob.st_ino && sib.st_ino != 0)
> +-		{
> +-		  /* Don't let as_fatal remove the output file!  */
> +-		  out_file_name = NULL;
> +-		  as_fatal (_("The input and output files must be distinct"));
> +-		}
> ++	      const char *saved_out_file_name = out_file_name;
> ++
> ++	      /* Don't let as_fatal remove the output file!  */
> ++	      out_file_name = NULL;
> ++	      as_fatal (_("The input '%s' and output '%s' files are the same"),
> ++			argv[i], saved_out_file_name);
> + 	    }
> + 	}
> +     }
> +--
> +2.7.4
> +
>