From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 11 Mar 2002 10:28:31 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~21974
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e47dbd052f7bbc28e9854d4cb1fdd4f5f53d8d0;p=external%2Fglibc.git

Update.

2002-03-11  Ulrich Drepper  <drepper@redhat.com>

	* gmon/Makefile (elide-routines.os): Add bb_init_func and bb_exit_func.
	They were never exported anyway.

	* gmon/gmon.c (_gmonparam): Add attribute_hidden.
	* gmon/sys/gmon.h: Remove declaration of _gmonparam.  It wasn't
	exported.
	* include/sys/gmon.h: Declare _gmonparam.

	* sysdeps/unix/sysv/linux/i386/getdents64.c: Don't define compatibility
	symbols for getdents64.  They were never exported.
---

diff --git a/ChangeLog b/ChangeLog
index 2fbdf7d..320bb87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-03-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* gmon/Makefile (elide-routines.os): Add bb_init_func and bb_exit_func.
+	They were never exported anyway.
+
+	* gmon/gmon.c (_gmonparam): Add attribute_hidden.
+	* gmon/sys/gmon.h: Remove declaration of _gmonparam.  It wasn't
+	exported.
+	* include/sys/gmon.h: Declare _gmonparam.
+
+	* sysdeps/unix/sysv/linux/i386/getdents64.c: Don't define compatibility
+	symbols for getdents64.  They were never exported.
+
 2002-03-09  Roland McGrath  <roland@frob.com>
 
 	* hurd/hurdsig.c (write_corefile): Fix swapped arguments to __dir_link.
diff --git a/gmon/gmon.c b/gmon/gmon.c
index b54b9aa..3380932 100644
--- a/gmon/gmon.c
+++ b/gmon/gmon.c
@@ -49,7 +49,7 @@
 
 struct __bb *__bb_head;	/*  Head of basic-block list or NULL. */
 
-struct gmonparam _gmonparam = { GMON_PROF_OFF };
+struct gmonparam _gmonparam attribute_hidden = { GMON_PROF_OFF };
 
 /*
  * See profil(2) where this is described:
diff --git a/gmon/sys/gmon.h b/gmon/sys/gmon.h
index bb17b75..c9064d7 100644
--- a/gmon/sys/gmon.h
+++ b/gmon/sys/gmon.h
@@ -143,7 +143,6 @@ struct gmonparam {
 	u_long		hashfraction;
 	long		log_hashfraction;
 };
-extern struct gmonparam _gmonparam;
 
 /*
  * Possible states of profiling.
diff --git a/include/sys/gmon.h b/include/sys/gmon.h
index d994dd5..49b37b2 100644
--- a/include/sys/gmon.h
+++ b/include/sys/gmon.h
@@ -11,5 +11,5 @@ struct __bb;
 extern void __bb_init_func (struct __bb *bb);
 extern void __bb_exit_func (void);
 
-
+extern struct gmonparam _gmonparam;
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/getdents64.c b/sysdeps/unix/sysv/linux/i386/getdents64.c
index ae73f14..e6fcf68 100644
--- a/sysdeps/unix/sysv/linux/i386/getdents64.c
+++ b/sysdeps/unix/sysv/linux/i386/getdents64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002 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
@@ -27,8 +27,6 @@
 #undef __GETDENTS
 #undef DIRENT_TYPE
 
-versioned_symbol (libc, __getdents64, getdents64, GLIBC_2_2);
-
 #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
 
 #include <sysdeps/unix/sysv/linux/i386/olddirent.h>
@@ -39,6 +37,4 @@ versioned_symbol (libc, __getdents64, getdents64, GLIBC_2_2);
 #define kernel_dirent64 old_kernel_dirent64
 
 #include <sysdeps/unix/sysv/linux/getdents.c>
-
-compat_symbol (libc, __old_getdents64, getdents64, GLIBC_2_1);
 #endif