about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-09-28 15:04:26 -0700
committerRoland McGrath <roland@hack.frob.com>2012-09-28 15:04:26 -0700
commit28c195f756b734ee92eed9463e440e6bcb85313e (patch)
tree16180b2baf9ccdbf5c6b0105062542f5e40482e5
parent848917f9ee60e08638c67bcb590ed4b4c4186b0b (diff)
downloadglibc-28c195f756b734ee92eed9463e440e6bcb85313e.tar.gz
glibc-28c195f756b734ee92eed9463e440e6bcb85313e.tar.xz
glibc-28c195f756b734ee92eed9463e440e6bcb85313e.zip
Fix stub open.c to define __libc_open.
-rw-r--r--ChangeLog2
-rw-r--r--io/open.c13
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fa7d734eeb..a41982de0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
+	* io/open.c (__open): Renamed to __libc_open.  Make __open an alias.
+
 	* posix/Makefile ($(objpfx)config-name.h): Do $(make-target-directory).
 
 	* nss/Makefile ($(objpfx)/libnss_test1.so$(libnss_test1.so-version)):
diff --git a/io/open.c b/io/open.c
index 0916b1e010..b6911206a0 100644
--- a/io/open.c
+++ b/io/open.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1995,1996,1997,2002,2007 Free Software Foundation, Inc.
+/* Open a file by name.  Stub version.
+   Copyright (C) 1991-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +27,7 @@ extern char **__libc_argv attribute_hidden;
 /* Open FILE with access OFLAG.  If OFLAG includes O_CREAT,
    a third argument is the file protection.  */
 int
-__open (file, oflag)
+__libc_open (file, oflag)
      const char *file;
      int oflag;
 {
@@ -49,10 +50,12 @@ __open (file, oflag)
   __set_errno (ENOSYS);
   return -1;
 }
-libc_hidden_def (__open)
-stub_warning (open)
+libc_hidden_def (__libc_open)
+weak_alias (__libc_open, __open)
+libc_hidden_weak (__open)
+weak_alias (__libc_open, open)
 
-weak_alias (__open, open)
+stub_warning (open)
 
 
 int