Add -Wshadow to the gcc command line options used when compiling the binutils.

[deliverable/binutils-gdb.git] / gold / fileread.h

diff --git a/gold/fileread.h b/gold/fileread.h
index 920a4da7b518149b11e4ffc946caa806aa1763f1..2e27d2f82e2d515be72898990dacfad8fe411654 100644 (file)
--- a/gold/fileread.h
+++ b/gold/fileread.h
@@ -65,8 +65,8 @@ class File_read
  public:
   File_read()
     : name_(), descriptor_(-1), is_descriptor_opened_(false), object_count_(0),
-      size_(0), token_(false), views_(), saved_views_(), contents_(NULL),
-      mapped_bytes_(0), released_(true)
+      size_(0), token_(false), views_(), saved_views_(), mapped_bytes_(0),
+      released_(true), whole_file_view_(NULL)
   { }
 
   ~File_read();
@@ -234,10 +234,23 @@ class File_read
   class View
   {
    public:
-    View(off_t start, section_size_type size, const unsigned char* data,
-        unsigned int byteshift, bool cache, bool mapped)
-      : start_(start), size_(size), data_(data), lock_count_(0),
-       byteshift_(byteshift), cache_(cache), mapped_(mapped), accessed_(true)
+    // Specifies how to dispose the data on destruction of the view.
+    enum Data_ownership
+    {
+      // Data owned by File object - nothing done in destructor.
+      DATA_NOT_OWNED,
+      // Data alocated with new[] and owned by this object - should
+      // use delete[].
+      DATA_ALLOCATED_ARRAY,
+      // Data mmapped and owned by this object - should munmap.
+      DATA_MMAPPED
+    };
+
+    View(off_t vstart, section_size_type vsize, const unsigned char* vdata,
+        unsigned int vbyteshift, bool cache, Data_ownership data_ownership)
+      : start_(vstart), size_(vsize), data_(vdata), lock_count_(0),
+       byteshift_(vbyteshift), cache_(cache), data_ownership_(data_ownership),
+       accessed_(true)
     { }
 
     ~View();
@@ -311,7 +324,7 @@ class File_read
     bool cache_;
     // Whether the view is mapped into memory.  If not, data_ points
     // to memory allocated using new[].
-    bool mapped_;
+    Data_ownership data_ownership_;
     // Whether the view has been accessed recently.
     bool accessed_;
   };
@@ -370,7 +383,13 @@ class File_read
   { return (file_size + (page_size - 1)) & ~ (page_size - 1); }
 
   // The maximum number of entries we will pass to ::readv.
+#ifdef HAVE_READV
   static const size_t max_readv_entries = 128;
+#else
+  // On targets that don't have readv set the max to 1 so readv is not
+  // used.
+  static const size_t max_readv_entries = 1;
+#endif
 
   // Use readv to read data.
   void
@@ -394,14 +413,18 @@ class File_read
   // List of views which were locked but had to be removed from views_
   // because they were not large enough.
   Saved_views saved_views_;
-  // Specified file contents.  Used only for testing purposes.
-  const unsigned char* contents_;
   // Total amount of space mapped into memory.  This is only changed
   // while the file is locked.  When we unlock the file, we transfer
   // the total to total_mapped_bytes, and reset this to zero.
   size_t mapped_bytes_;
   // Whether the file was released.
   bool released_;
+  // A view containing the whole file.  May be NULL if we mmap only
+  // the relevant parts of the file.  Not NULL if:
+  // - Flag --mmap_whole_files is set (default on 64-bit hosts).
+  // - The contents was specified in the constructor.  Used only for
+  //   testing purposes).
+  View* whole_file_view_;
 };
 
 // A view of file data that persists even when the file is unlocked.
@@ -427,8 +450,8 @@ class File_view
   friend class File_read;
 
   // Callers have to get these via File_read::get_lasting_view.
-  File_view(File_read& file, File_read::View* view, const unsigned char* data)
-    : file_(file), view_(view), data_(data)
+  File_view(File_read& file, File_read::View* view, const unsigned char* vdata)
+    : file_(file), view_(view), data_(vdata)
   { }
 
   File_read& file_;