summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--elf/dl-addr.c4
-rw-r--r--elf/tst-auditmod4b.c2
-rw-r--r--elf/tst-auditmod6b.c2
-rw-r--r--elf/tst-auditmod6c.c2
-rw-r--r--elf/tst-auditmod7b.c2
6 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b70fe1943c..a883f9386a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-23  Marek Polacek  <polacek@redhat.com>
+
+	* elf/dl-addr.c (determine_info): Add inline keyword.
+	* elf/tst-auditmod4b.c (check_avx): Likewise.
+	* elf/tst-auditmod6b.c (check_avx): Likewise.
+	* elf/tst-auditmod6c.c (check_avx): Likewise.
+	* elf/tst-auditmod7b.c (check_avx): Likewise.
+
 2011-12-23  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/i386/fpu/bits/fenv.h (feraiseexcept): Also enable for
diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 2b53a5ed09..788225635e 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -1,5 +1,5 @@
 /* Locate the shared object symbol nearest a given address.
-   Copyright (C) 1996-2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007, 2009, 2011 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
@@ -22,7 +22,7 @@
 #include <ldsodefs.h>
 
 
-static void
+static inline void
 __attribute ((always_inline))
 determine_info (const ElfW(Addr) addr, struct link_map *match, Dl_info *info,
 		struct link_map **mapp, const ElfW(Sym) **symbolp)
diff --git a/elf/tst-auditmod4b.c b/elf/tst-auditmod4b.c
index a6d3c6a6c5..761d97ce9d 100644
--- a/elf/tst-auditmod4b.c
+++ b/elf/tst-auditmod4b.c
@@ -108,7 +108,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
 
 static int avx = -1;
 
-static int
+static inline int
 __attribute ((always_inline))
 check_avx (void)
 {
diff --git a/elf/tst-auditmod6b.c b/elf/tst-auditmod6b.c
index f756b50227..a7a60b9927 100644
--- a/elf/tst-auditmod6b.c
+++ b/elf/tst-auditmod6b.c
@@ -108,7 +108,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
 
 static int avx = -1;
 
-static int
+static inline int
 __attribute ((always_inline))
 check_avx (void)
 {
diff --git a/elf/tst-auditmod6c.c b/elf/tst-auditmod6c.c
index 49cbf05492..e0b5ac2319 100644
--- a/elf/tst-auditmod6c.c
+++ b/elf/tst-auditmod6c.c
@@ -108,7 +108,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
 
 static int avx = -1;
 
-static int
+static inline int
 __attribute ((always_inline))
 check_avx (void)
 {
diff --git a/elf/tst-auditmod7b.c b/elf/tst-auditmod7b.c
index eb237586fe..a27d38540e 100644
--- a/elf/tst-auditmod7b.c
+++ b/elf/tst-auditmod7b.c
@@ -108,7 +108,7 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
 
 static int avx = -1;
 
-static int
+static inline int
 __attribute ((always_inline))
 check_avx (void)
 {