Stop the assembler from overwriting its output file.

	* as.c (main): Fail if the output is the same as one of the input
	files.
	* testsuite/gas/all/gas.exp: Test the new feature.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f1c081aaf87731fbda6424b5dad0b39a185557cb..d87d3e793a928442f5b26b5e7eea4075e916fe1b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-12  John Darrington  <john@darrington.wattle.id.au>
+
+       * as.c (main): Fail if the output is the same as one of the input
+       files.
+       * testsuite/gas/all/gas.exp: Test the new feature.
+
 2018-04-12  Nick Clifton  <nickc@redhat.com>
 
        * po/es.po: Updated Spanish translation.

diff --git a/gas/as.c b/gas/as.c
index f6da1b1a1d477edba5eeaef6c81bce0753864cfe..6e8ec5678556e8b41f52d9f80a7398fa7d2ca80c 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -1171,6 +1171,7 @@ int
 main (int argc, char ** argv)
 {
   char ** argv_orig = argv;
+  struct stat sob;
 
   int macro_strip_at;
 
@@ -1218,6 +1219,27 @@ main (int argc, char ** argv)
   /* Call parse_args before any of the init/begin functions
      so that switches like --hash-size can be honored.  */
   parse_args (&argc, &argv);
+
+  if (argc > 1 && stat (out_file_name, &sob) == 0)
+    {
+      int i;
+
+      for (i = 1; i < argc; ++i)
+       {
+         struct stat sib;
+
+         if (stat (argv[i], &sib) == 0)
+           {
+             if (sib.st_ino == sob.st_ino)
+               {
+                 /* Don't let as_fatal remove the output file!  */
+                 out_file_name = NULL;
+                 as_fatal (_("The input and output files must be distinct"));
+               }
+           }
+       }
+    }
+
   symbol_begin ();
   frag_init ();
   subsegs_begin ();

diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 0355a03fa44b867bc08538d7cd187a398e73da5c..b3d662a9f23c6ae6926e20b9e5465467315f29cc 100644 (file)
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -73,6 +73,8 @@ if {    ![istarget alpha*-*-*vms*]
 gas_test_error "equiv1.s" "" ".equiv for symbol already set to another one"
 gas_test_error "equiv2.s" "" ".equiv for symbol already set to an expression"
 
+gas_test_error "none.s" "-o $srcdir/$subdir/none.s" "Output file must be distinct from input"
+
 # .equ works differently on some targets.
 case $target_triplet in {
     { hppa*-*-* } { }