summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/i486/bits/string.h8
-rw-r--r--sysdeps/i386/init-first.c8
-rw-r--r--sysdeps/mach/hurd/i386/init-first.c20
-rw-r--r--sysdeps/mach/hurd/mips/init-first.c10
-rw-r--r--sysdeps/sparc/sparc32/dl-machine.h4
-rw-r--r--sysdeps/stub/init-first.c4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h2
7 files changed, 28 insertions, 28 deletions
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 5e4abbc3e5..10915ced1d 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -471,7 +471,7 @@ __strcpy_g (char *__dest, __const char *__src)
case 2: \
*((__uint16_t *) __cp) = \
__STRING_SMALL_GET16 (src, 0); \
- ++cp; \
+ ++__cp; \
break; \
case 3: \
*((__uint16_t *) __cp)++ = \
@@ -481,7 +481,7 @@ __strcpy_g (char *__dest, __const char *__src)
case 4: \
*((__uint32_t *) __cp) = \
__STRING_SMALL_GET32 (src, 0); \
- cp += 3; \
+ __cp += 3; \
break; \
case 5: \
*((__uint32_t *) __cp)++ = \
@@ -493,7 +493,7 @@ __strcpy_g (char *__dest, __const char *__src)
__STRING_SMALL_GET32 (src, 0); \
*((__uint16_t *) __cp) = \
__STRING_SMALL_GET16 (src, 4); \
- ++cp; \
+ ++__cp; \
break; \
case 7: \
*((__uint32_t *) __cp)++ = \
@@ -507,7 +507,7 @@ __strcpy_g (char *__dest, __const char *__src)
__STRING_SMALL_GET32 (src, 0); \
*((__uint32_t *) __cp) = \
__STRING_SMALL_GET32 (src, 4); \
- cp += 3; \
+ __cp += 3; \
break; \
} \
__cp; }))
diff --git a/sysdeps/i386/init-first.c b/sysdeps/i386/init-first.c
index 47dd299e18..118f84201f 100644
--- a/sysdeps/i386/init-first.c
+++ b/sysdeps/i386/init-first.c
@@ -1,6 +1,6 @@
/* Initialization code run first thing by the ELF startup code. For i386/Unix.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
+ Copyright (C) 1995, 1996, 1997 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
modify it under the terms of the GNU Library General Public License as
@@ -20,7 +20,7 @@
#include <unistd.h>
extern void __libc_init (int, char **, char **);
-extern void __getopt_clean_environment (void);
+extern void __getopt_clean_environment (char **);
extern void __libc_global_ctors (void);
int __libc_multiple_libcs = 1;
@@ -36,7 +36,7 @@ init (int *data)
__libc_init (argc, argv, envp);
/* This is a hack to make the special getopt in GNU libc working. */
- __getopt_clean_environment ();
+ __getopt_clean_environment (envp);
}
#ifdef PIC
diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index 4c4f6ff665..10094f0967 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -27,7 +27,7 @@
extern void __mach_init (void);
extern void __libc_init (int, char **, char **);
-extern void __getopt_clean_environment (void);
+extern void __getopt_clean_environment (char **);
extern void __libc_global_ctors (void);
unsigned int __hurd_threadvar_max;
@@ -109,7 +109,7 @@ init1 (int argc, char *arg0, ...)
__libc_init (argc, argv, __environ);
/* This is a hack to make the special getopt in GNU libc working. */
- __getopt_clean_environment ();
+ __getopt_clean_environment (envp);
#ifdef PIC
__libc_global_ctors ();
@@ -170,7 +170,7 @@ init (int *data)
/* Force NEWSP into %ecx and &init1 into %eax, which are not restored
by function return. */
asm volatile ("# a %0 c %1" : : "a" (newsp), "c" (&init1));
- }
+ }
else
{
/* The argument data is just above the stack frame we will unwind by
@@ -202,7 +202,7 @@ init (int *data)
init1's return address, and then jump there. */
asm volatile ("pushl %eax; jmp *%ecx");
/* NOTREACHED */
-}
+}
#ifdef PIC
@@ -223,7 +223,7 @@ _init (int argc, ...)
__mach_init ();
RUN_HOOK (_hurd_preinit_hook, ());
-
+
init (&argc);
}
#endif
@@ -256,7 +256,7 @@ __libc_init_first (int argc __attribute__ ((unused)), ...)
__mach_init ();
RUN_HOOK (_hurd_preinit_hook, ());
-
+
_hurd_startup ((void **) &argc, &doinit);
#endif
}
@@ -267,8 +267,8 @@ __libc_init_first (int argc __attribute__ ((unused)), ...)
in ld.so causes disaster, because the _init definition above will
cause ld.so to gain an init function, which is not a cool thing. */
-void
-_dl_start (void)
-{
- abort ();
+void
+_dl_start (void)
+{
+ abort ();
}
diff --git a/sysdeps/mach/hurd/mips/init-first.c b/sysdeps/mach/hurd/mips/init-first.c
index b057aeb097..a411a1b0e9 100644
--- a/sysdeps/mach/hurd/mips/init-first.c
+++ b/sysdeps/mach/hurd/mips/init-first.c
@@ -27,7 +27,7 @@
extern void __mach_init (void);
extern void __libc_init (int, char **, char **);
-extern void __getopt_clean_environment (void);
+extern void __getopt_clean_environment (char **);
extern void __libc_global_ctors (void);
unsigned int __hurd_threadvar_max;
@@ -110,7 +110,7 @@ init1 (int argc, char *arg0, ...)
__libc_init (argc, argv, __environ);
/* This is a hack to make the special getopt in GNU libc working. */
- __getopt_clean_environment ();
+ __getopt_clean_environment (envp);
#ifdef PIC
__libc_global_ctors ();
@@ -169,14 +169,14 @@ __init (int *data)
be the return address for `init1'; we will jump there with NEWSP
as the stack pointer. */
return newsp;
- }
+ }
/* The argument data is just above the stack frame we will unwind by
returning. */
return (void *) data;
(void) &__init;
-}
+}
#ifdef PIC
/* This function is called to initialize the shared C library.
@@ -399,7 +399,7 @@ ___libc_init_first (int return_addr, int argc, ...)
#endif
RUN_HOOK (_hurd_preinit_hook, ());
-
+
_hurd_startup ((void **) &argc, &doinit);
(void) &___libc_init_first;
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index 39bcab7df5..b80c126487 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -308,10 +308,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
/* For thread safety, write the instructions from the bottom and
flush before we overwrite the critical "b,a". */
reloc_addr[2] = OPCODE_JMP_G1 | (value & 0x3ff);
- if (1 || (_dl_hwcap & 1)) /* HWCAP_SPARC_FLUSH */
+ if (_dl_hwcap & HWCAP_SPARC_FLUSH)
__asm __volatile ("flush %0+8" : : "r"(reloc_addr));
reloc_addr[1] = OPCODE_SETHI_G1 | (value >> 10);
- if (1 || (_dl_hwcap & 1)) /* HWCAP_SPARC_FLUSH */
+ if (_dl_hwcap & HWCAP_SPARC_FLUSH)
__asm __volatile ("flush %0+4" : : "r"(reloc_addr));
break;
case R_SPARC_8:
diff --git a/sysdeps/stub/init-first.c b/sysdeps/stub/init-first.c
index 4fcc67ddbe..dacefdcb63 100644
--- a/sysdeps/stub/init-first.c
+++ b/sysdeps/stub/init-first.c
@@ -23,7 +23,7 @@
int __libc_multiple_libcs = 1;
extern void __libc_init (int, char **, char **);
-extern void __getopt_clean_environment (void);
+extern void __getopt_clean_environment (char **);
pid_t __libc_pid;
@@ -51,5 +51,5 @@ void __libc_init_first
__libc_init (argc, argv, envp);
/* This is a hack to make the special getopt in GNU libc working. */
- __getopt_clean_environment ();
+ __getopt_clean_environment (envp);
}
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
index 9a4666a508..462f7c2998 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h
@@ -51,7 +51,7 @@ typedef __u_int __nlink_t; /* Type of file link counts. */
typedef long int __off_t; /* Type of file sizes and offsets. */
typedef __quad_t __loff_t; /* Type of file sizes and offsets. */
typedef int __pid_t; /* Type of process identifications. */
-typedef long int __ssize_t; /* Type of a byte count, or error. */
+typedef long long int __ssize_t; /* Type of a byte count, or error. */
typedef struct
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 03:45:35 +0000