From: Roland McGrath <roland@gnu.org>
Date: Fri, 7 Dec 2012 21:49:47 +0000 (+0000)
Subject: gold/
X-Git-Tag: binutils-2_23_2~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0213f4952bef184d58a876be626c2b04923cdb02;p=thirdparty%2Fbinutils-gdb.git

gold/
	* testsuite/binary_unittest.cc (Sized_binary_test):
	Use open_descriptor rather than ::open.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1018a1f6727..1e21f577142 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -7,6 +7,11 @@
 	* Makefile.in: Regenerate.
 	* testsuite/Makefile.in: Regenerate.
 
+2012-12-07  Roland McGrath  <mcgrathr@google.com>
+
+	* testsuite/binary_unittest.cc (Sized_binary_test):
+	Use open_descriptor rather than ::open.
+
 2012-11-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gold/14858
diff --git a/gold/testsuite/binary_unittest.cc b/gold/testsuite/binary_unittest.cc
index a9f47c20fcb..6e7b244121e 100644
--- a/gold/testsuite/binary_unittest.cc
+++ b/gold/testsuite/binary_unittest.cc
@@ -1,6 +1,6 @@
 // binary_unittest.cc -- test Binary_to_elf
 
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008, 2012 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -33,6 +33,7 @@
 #include "options.h"
 #include "binary.h"
 #include "object.h"
+#include "descriptors.h"
 
 #include "test.h"
 #include "testfile.h"
@@ -53,7 +54,7 @@ Sized_binary_test()
   // Use the executable itself as the binary data.
   struct stat st;
   CHECK(::stat(gold::program_name, &st) == 0);
-  int o = ::open(gold::program_name, O_RDONLY);
+  int o = open_descriptor(-1, gold::program_name, O_RDONLY);
   CHECK(o >= 0);
   unsigned char* filedata = new unsigned char[st.st_size];
   CHECK(::read(o, filedata, st.st_size) == st.st_size);