Fixed incorrect use of mvcle introduced by 2001-07-12 change.

[kopensolaris-gnu/glibc.git] / sysdeps / powerpc / dl-machine.c

diff --git a/sysdeps/powerpc/dl-machine.c b/sysdeps/powerpc/dl-machine.c
index 84bd8c2..c9c4fe0 100644 (file)
--- a/sysdeps/powerpc/dl-machine.c
+++ b/sysdeps/powerpc/dl-machine.c
@@ -3,19 +3,19 @@
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <unistd.h>
 #include <string.h>
@@ -119,7 +119,11 @@ __elf_preferred_address(struct link_map *loader, size_t maplength,
       mapend = l->l_map_end | (_dl_pagesize - 1);
       assert (mapend > mapstart);
 
-      if (mapend >= high && high >= mapstart)
+      /* Prefer gaps below the main executable, note that l ==
+        _dl_loaded does not work for static binaries loading
+        e.g. libnss_*.so.  */
+      if ((mapend >= high || l->l_type == lt_executable)
+         && high >= mapstart)
        high = mapstart;
       else if (mapend >= low && low >= mapstart)
        low = mapend;
@@ -469,7 +473,7 @@ __process_machine_rela (struct link_map *map,
 
          strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
          _dl_error_printf ("\
-%s: Symbol `%s' has different size in shared object, onsider re-linking\n"
+%s: Symbol `%s' has different size in shared object, onsider re-linking\n",
                            _dl_argv[0] ?: "<program name unknown>",
                            strtab + refsym->st_name);
        }