summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog46
-rw-r--r--fedora/branch.mk4
-rw-r--r--malloc/Makefile3
-rw-r--r--nptl/ChangeLog2
-rw-r--r--sysdeps/i386/i486/bits/string.h3
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S6
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/setjmp-common.S10
-rw-r--r--sysdeps/powerpc/powerpc64/__longjmp-common.S6
-rw-r--r--sysdeps/powerpc/powerpc64/setjmp-common.S10
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S25
11 files changed, 69 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c548b1950..f6404366ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,24 @@
-2004-12-15 Jakub Jelinek <jakub@redhat.com>
+2004-12-15 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Correct stack
+ alignment. Clean up flag bit tests.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Correct stack
+ alignment. Clean up flag bit tests. Remove redundent SP assignment.
+ Add TOC register save/restore around function call.
+
+ * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Make no_vmx symbol
+ local.
+ * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Make no_vmx symbol
+ local.
+ * sysdeps/powerpc/powerpc64/__longjmp-common.S: Make no_vmx symbol
+ local.
+ * sysdeps/powerpc/powerpc64/setjmp-common.S: Make no_vmx and
+ aligned_save_vmx symbol local.
- * nis/nis_domain_of_r.c (nis_domain_of_r): Use libnsl_hidden_def,
- not libnsl_hidden_proto.
+2004-12-15 Ulrich Drepper <drepper@redhat.com>
- * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S (__clone): Save
- and restore r2 around call to fn.
+ * sysdeps/i386/i486/bits/string.h (__strncat_g): Fix i686
+ implementation.
2004-09-08 H.J. Lu <hongjiu.lu@intel.com>
@@ -13,21 +27,29 @@
(gnulib): Always set to -lgcc $(libgcc_eh).
(static-gnulib): Always set to -lgcc -lgcc_eh $(libunwind).
(libc.so-gnulib): New.
-
* Makerules (LDLIBS-c.so): Use $(libc.so-gnulib) instead of
$(static-gnulib).
-
* configure.in (libc_cv_cc_with_libunwind): Set to yes if gcc
uses -lunwind for static binaries.
- * configure: Regenerated.
-2004-12-14 Jakub Jelinek <jakub@redhat.com>
+2004-06-05 Joseph S. Myers <jsm@polyomino.org.uk>
- * sysdeps/unix/sysv/linux/s390/s390-32/clone.S (__clone): Add support for
- NPTL where the PID is stored at userlevel and needs to be reset when
- CLONE_THREAD is not used.
+ * malloc/Makefile (install-bin): Remove memusage.
+ (install-bin-script): Add memusage.
+
+2004-12-15 Jakub Jelinek <jakub@redhat.com>
+
+ * nis/nis_domain_of_r.c (nis_domain_of_r): Use libnsl_hidden_def,
+ not libnsl_hidden_proto.
+
+ * sysdeps/unix/sysv/linux/s390/s390-32/clone.S (__clone): Add support
+ for NPTL where the PID is stored at userlevel and needs to be reset
+ when CLONE_THREAD is not used.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S (__clone): Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S (__clone): Save
+ and restore r2 around call to fn.
+
2004-12-15 Andreas Jaeger <aj@suse.de>
* sysdeps/ia64/dl-machine.h (elf_machine_rela): Mark auto instead
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 2679fe2ffe..e15a81f0a6 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
# This file is updated automatically by Makefile.
glibc-branch := fedora
glibc-base := HEAD
-fedora-sync-date := 2004-12-15 08:47 UTC
-fedora-sync-tag := fedora-glibc-20041215T0847
+fedora-sync-date := 2004-12-15 20:56 UTC
+fedora-sync-tag := fedora-glibc-20041215T2056
diff --git a/malloc/Makefile b/malloc/Makefile
index 6c04518b39..0512c49839 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -78,7 +78,8 @@ endif
ifneq ($(cross-compiling),yes)
# If the gd library is available we build the `memusagestat' program.
ifneq ($(LIBGD),no)
-install-bin = memusagestat memusage
+install-bin = memusagestat
+install-bin-script += memusage
generated += memusagestat memusage
extra-objs += memusagestat.o
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6f8b796200..fea9ec1ce4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,4 +1,4 @@
-2004-12-14 Jakub Jelinek <jakub@redhat.com>
+2004-12-15 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: New file.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: New file.
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index 099d720a4c..203907b146 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -1050,6 +1050,7 @@ __strncat_g (char *__dest, __const char __src[], size_t __n)
#ifdef __i686__
__asm__ __volatile__
("repne; scasb\n"
+ "movl %4, %3\n\t"
"decl %1\n\t"
"1:\n\t"
"decl %3\n\t"
@@ -1062,7 +1063,7 @@ __strncat_g (char *__dest, __const char __src[], size_t __n)
"2:\n\t"
"movb $0,(%1)"
: "=&a" (__dummy), "=&D" (__tmp), "=&S" (__src), "=&c" (__n)
- : "0" (0), "1" (__tmp), "2" (__src), "3" (__n)
+ : "g" (__n), "0" (0), "1" (__tmp), "2" (__src), "3" (0xffffffff)
: "memory", "cc");
#else
--__tmp;
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index b61e127a99..a2415b9542 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
@@ -50,7 +50,7 @@ ENTRY (BP_SYM (__longjmp))
lwz r5,_dl_hwcap@l(r5)
# endif
andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16)
- beq no_vmx
+ beq L(no_vmx)
la r5,((JB_VRS)*4)(3)
andi. r6,r5,0xf
lwz r0,((JB_VRSAVE)*4)(3)
@@ -78,7 +78,7 @@ ENTRY (BP_SYM (__longjmp))
load_misaligned_vmx_lo_loaded(v30,v31,v0,r6,r5)
lvx v1,0,r5
vperm v31,v31,v1,v0
- b no_vmx
+ b L(no_vmx)
aligned_restore_vmx:
addi r6,r5,16
lvx v20,0,r5
@@ -103,7 +103,7 @@ aligned_restore_vmx:
addi r6,r6,32
lvx v30,0,r5
lvx v31,0,r6
-no_vmx:
+L(no_vmx):
#endif
lwz r1,(JB_GPR1*4)(r3)
lwz r0,(JB_LR*4)(r3)
diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
index 796d24f25c..77ee05f487 100644
--- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
@@ -92,13 +92,13 @@ ENTRY (BP_SYM (__sigsetjmp))
lwz r5,_dl_hwcap@l(r5)
#endif
andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16)
- beq no_vmx
+ beq L(no_vmx)
la r5,((JB_VRS)*4)(3)
andi. r6,r5,0xf
mfspr r0,VRSAVE
stw r0,((JB_VRSAVE)*4)(3)
addi r6,r5,16
- beq+ aligned_save_vmx
+ beq+ L(aligned_save_vmx)
lvsr v0,0,r5
vspltisb v1,-1 /* set v1 to all 1's */
vspltisb v2,0 /* set v2 to all 0's */
@@ -137,9 +137,9 @@ ENTRY (BP_SYM (__sigsetjmp))
stvx v5,0,r6
vsel v4,v31,v4,v3
stvx v4,0,r5
- b no_vmx
+ b L(no_vmx)
-aligned_save_vmx:
+L(aligned_save_vmx):
stvx 20,0,r5
addi r5,r5,32
stvx 21,0,r6
@@ -162,7 +162,7 @@ aligned_save_vmx:
addi r6,r6,32
stvx 30,0,r5
stvx 31,0,r6
-no_vmx:
+L(no_vmx):
#endif
b JUMPTARGET (BP_SYM (__sigjmp_save))
END (BP_SYM (__sigsetjmp))
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S
index 9d0195dd14..30087d7db4 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S
@@ -53,7 +53,7 @@ ENTRY (BP_SYM (__longjmp))
ld r5,0(r5) /* Load extern _dl_hwcap. */
# endif
andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16)
- beq no_vmx
+ beq L(no_vmx)
la r5,((JB_VRS)*8)(3)
andi. r6,r5,0xf
lwz r0,((JB_VRSAVE)*8)(3)
@@ -81,7 +81,7 @@ ENTRY (BP_SYM (__longjmp))
load_misaligned_vmx_lo_loaded(v30,v31,v0,r6,r5)
lvx v1,0,r5
vperm v31,v31,v1,v0
- b no_vmx
+ b L(no_vmx)
aligned_restore_vmx:
addi r6,r5,16
lvx v20,0,r5
@@ -106,7 +106,7 @@ aligned_restore_vmx:
addi r6,r6,32
lvx v30,0,r5
lvx v31,0,r6
-no_vmx:
+L(no_vmx):
#endif
ld r1,(JB_GPR1*8)(r3)
ld r2,(JB_GPR2*8)(r3)
diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S
index f82d5a21f5..0de07a82d3 100644
--- a/sysdeps/powerpc/powerpc64/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/setjmp-common.S
@@ -102,13 +102,13 @@ JUMPTARGET(GLUE(__sigsetjmp,_ent)):
ld r5,0(r5) /* Load extern _dl_hwcap. */
# endif
andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16)
- beq no_vmx
+ beq L(no_vmx)
la r5,((JB_VRS)*8)(3)
andi. r6,r5,0xf
mfspr r0,VRSAVE
stw r0,((JB_VRSAVE)*8)(3)
addi r6,r5,16
- beq+ aligned_save_vmx
+ beq+ L(aligned_save_vmx)
lvsr v0,0,r5
vspltisb v1,-1 /* set v1 to all 1's */
vspltisb v2,0 /* set v2 to all 0's */
@@ -150,9 +150,9 @@ JUMPTARGET(GLUE(__sigsetjmp,_ent)):
stvx v5,0,r6
vsel v4,v31,v4,v3
stvx v4,0,r5
- b no_vmx
+ b L(no_vmx)
-aligned_save_vmx:
+L(aligned_save_vmx):
stvx 20,0,r5
addi r5,r5,32
stvx 21,0,r6
@@ -175,7 +175,7 @@ aligned_save_vmx:
addi r6,r6,32
stvx 30,0,r5
stvx 31,0,r6
-no_vmx:
+L(no_vmx):
#endif
b JUMPTARGET (BP_SYM (__sigjmp_save))
END (BP_SYM (__sigsetjmp))
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
index 891cf83631..f232284747 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
@@ -48,7 +48,7 @@ ENTRY (BP_SYM (__clone))
beq- cr0,L(badargs)
/* Set up stack frame for parent. */
- stwu r1,-36(r1)
+ stwu r1,-32(r1)
#ifdef RESET_PID
stmw r28,16(r1)
#else
@@ -100,7 +100,7 @@ ENTRY (BP_SYM (__clone))
#endif
#ifdef RESET_PID
- andis. r0,r28,1 /* This is & CLONE_THREAD */
+ andis. r0,r28,CLONE_THREAD>>16
bne+ r0,L(oldpid)
andi. r0,r28,CLONE_VM
li r3,-1
@@ -130,7 +130,7 @@ L(parent):
lmw r30,16(r1)
# endif
#endif
- addi r1,r1,36
+ addi r1,r1,32
bnslr+
b JUMPTARGET(__syscall_error)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
index f6ce115077..287597c480 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S
@@ -42,18 +42,17 @@ ENTRY (BP_SYM (__clone))
/* Check for child_stack == NULL || fn == NULL. */
cmpdi cr0,r4,0
- ld r0,0(r3)
- cmpdi cr1,r0,0
+ cmpdi cr1,r3,0
cror cr0*4+eq,cr1*4+eq,cr0*4+eq
beq- cr0,L(badargs)
/* Set up stack frame for parent. */
- stdu r1,-88(r1)
+ stdu r1,-80(r1)
std r29,56(r1)
std r30,64(r1)
std r31,72(r1)
#ifdef RESET_PID
- std r28,80(r1)
+ std r28,48(r1)
#endif
/* Set up stack frame for child. */
@@ -85,18 +84,12 @@ ENTRY (BP_SYM (__clone))
crandc cr1*4+eq,cr1*4+eq,cr0*4+so
bne- cr1,L(parent) /* The '-' is to minimise the race. */
- /* On at least mklinux DR3a5, clone() doesn't actually change
- the stack pointer. I'm pretty sure this is a bug, because
- it adds a race condition if a signal is sent to a thread
- just after it is created (in the previous three instructions). */
- mr r1,r30
-
#ifdef RESET_PID
- rldicl. r0,r28,48,63 /* This is & CLONE_THREAD */
- bne+ r0,L(oldpid)
- rldicl. r0,r28,56,63 /* This is & CLONE_VM */
+ andis. r0,r28,CLONE_THREAD>>16
+ bne+ cr0,L(oldpid)
+ andi. r0,r28,CLONE_VM
li r3,-1
- bne- r0,L(nomoregetpid)
+ bne- cr0,L(nomoregetpid)
DO_CALL(SYS_ify(getpid))
L(nomoregetpid):
stw r3,TID(r13)
@@ -122,12 +115,12 @@ L(oldpid):
L(parent):
/* Parent. Restore registers & return. */
#ifdef RESET_PID
- ld r28,88(r1)
+ ld r28,48(r1)
#endif
ld r31,72(r1)
ld r30,64(r1)
ld r29,56(r1)
- addi r1,r1,88
+ addi r1,r1,80
bnslr+
b JUMPTARGET(__syscall_error)
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2025-01-13 05:20:42 +0000