gdb: Don't skip prologue for explicit line breakpoints in assembler

[deliverable/binutils-gdb.git] / gdb / common / scoped_mmap.c

diff --git a/gdb/common/scoped_mmap.c b/gdb/common/scoped_mmap.c
index aa2f703fa1648175827d38d1360048496abf84cf..19175e4a919a8a2de2b8bd20cf6f73af64077167 100644 (file)
--- a/gdb/common/scoped_mmap.c
+++ b/gdb/common/scoped_mmap.c
@@ -1,6 +1,6 @@
 /* scoped_mmap, automatically unmap files
 
-   Copyright (C) 2018 Free Software Foundation, Inc.
+   Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,22 +17,23 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
+#include "common-defs.h"
 #include "scoped_mmap.h"
 #include "scoped_fd.h"
+#include "common/filestuff.h"
 
 #ifdef HAVE_SYS_MMAN_H
 
 scoped_mmap
 mmap_file (const char *filename)
 {
-  scoped_fd fd (open (filename, O_RDONLY));
+  scoped_fd fd (gdb_open_cloexec (filename, O_RDONLY, 0));
   if (fd.get () < 0)
-    perror_with_name ("open");
+    perror_with_name (("open"));
 
   off_t size = lseek (fd.get (), 0, SEEK_END);
   if (size < 0)
-    perror_with_name ("lseek");
+    perror_with_name (("lseek"));
 
   /* We can't map an empty file.  */
   if (size == 0)
@@ -40,7 +41,7 @@ mmap_file (const char *filename)
 
   scoped_mmap mmapped_file (nullptr, size, PROT_READ, MAP_PRIVATE, fd.get (), 0);
   if (mmapped_file.get () == MAP_FAILED)
-    perror_with_name ("mmap");
+    perror_with_name (("mmap"));
 
   return mmapped_file;
 }