summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/dl-machine.h3
-rw-r--r--sysdeps/i386/fpu/__math.h2
-rw-r--r--sysdeps/m68k/dl-machine.h3
-rw-r--r--sysdeps/powerpc/dl-machine.h5
-rw-r--r--sysdeps/sparc/dl-machine.h3
-rw-r--r--sysdeps/standalone/arm/errnos.h27
-rw-r--r--sysdeps/stub/start.c2
-rw-r--r--sysdeps/unix/sysv/sysd-stdio.c2
8 files changed, 25 insertions, 22 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index ea938c3b88..3e0f9b126c 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -263,7 +263,8 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_386_COPY:
- if (sym->st_size != refsym->st_size)
+ if (sym->st_size > refsym->st_size
+ || (_dl_verbose && sym->st_size < refsym->st_size))
{
const char *strtab;
diff --git a/sysdeps/i386/fpu/__math.h b/sysdeps/i386/fpu/__math.h
index e6f5a31581..d5945e8ca2 100644
--- a/sysdeps/i386/fpu/__math.h
+++ b/sysdeps/i386/fpu/__math.h
@@ -433,7 +433,7 @@ logb (double __x)
register double __value, __junk;
__asm __volatile__
("fxtract\n\t"
- : "=t" (__value), "=u" (__junk) : "0" (__x));
+ : "=t" (__junk), "=u" (__value) : "0" (__x));
return __value;
}
diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index dee2a4653b..1523ddb1c6 100644
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -227,7 +227,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_68K_COPY:
- if (sym->st_size != refsym->st_size)
+ if (sym->st_size > refsym->st_size
+ || (_dl_verbose && sym->st_size < refsym->st_size))
{
const char *strtab;
diff --git a/sysdeps/powerpc/dl-machine.h b/sysdeps/powerpc/dl-machine.h
index 64ca7b4b69..17e8d9a12d 100644
--- a/sysdeps/powerpc/dl-machine.h
+++ b/sysdeps/powerpc/dl-machine.h
@@ -591,7 +591,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
}
else if (rinfo == R_PPC_COPY)
{
- if (sym->st_size != refsym->st_size)
+ if (sym->st_size > refsym->st_size
+ || (_dl_verbose && sym->st_size < refsym->st_size))
{
const char *strtab;
@@ -666,5 +667,3 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
#define ELF_MACHINE_NO_REL 1
#endif
-
-
diff --git a/sysdeps/sparc/dl-machine.h b/sysdeps/sparc/dl-machine.h
index accd3a1682..20def2c5b7 100644
--- a/sysdeps/sparc/dl-machine.h
+++ b/sysdeps/sparc/dl-machine.h
@@ -130,7 +130,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_SPARC_COPY:
- if (sym->st_size != refsym->st_size)
+ if (sym->st_size > refsym->st_size
+ || (_dl_verbose && sym->st_size < refsym->st_size))
{
const char *strtab;
diff --git a/sysdeps/standalone/arm/errnos.h b/sysdeps/standalone/arm/errnos.h
index 428fe9eb77..8090a8074d 100644
--- a/sysdeps/standalone/arm/errnos.h
+++ b/sysdeps/standalone/arm/errnos.h
@@ -1,20 +1,20 @@
/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ 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.
+ 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.
-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.
+ 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.
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ 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. */
/* This file defines the `errno' constants for standalone ARM machines.
These constants are essentially arbitrary. */
@@ -46,6 +46,7 @@ Cambridge, MA 02139, USA. */
#define ENOENT 18
#define EPROTOTYPE 19
#define ESRCH 20
+#define EPERM 21
#endif
#define __set_errno(val) errno = (val)
diff --git a/sysdeps/stub/start.c b/sysdeps/stub/start.c
index c16582d9b3..cf7efc931a 100644
--- a/sysdeps/stub/start.c
+++ b/sysdeps/stub/start.c
@@ -13,4 +13,4 @@ weak_alias (__data_start, data_start)
#endif
volatile int __errno;
-string_alias (__errno, errno)
+strong_alias (__errno, errno)
diff --git a/sysdeps/unix/sysv/sysd-stdio.c b/sysdeps/unix/sysv/sysd-stdio.c
index 35dae27a37..7f82340201 100644
--- a/sysdeps/unix/sysv/sysd-stdio.c
+++ b/sysdeps/unix/sysv/sysd-stdio.c
@@ -1,2 +1,2 @@
#define EINTR_REPEAT
-#include <../sysdeps/generic/sysd-stdio.c>
+#include <sysdeps/generic/sysd-stdio.c>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 03:56:44 +0000