diff options
| -rw-r--r-- | ChangeLog | 66 | ||||
| -rw-r--r-- | benchtests/Makefile | 5 | ||||
| -rw-r--r-- | elf/Makefile | 4 | ||||
| -rw-r--r-- | malloc/Makefile | 2 | ||||
| -rw-r--r-- | math/Makefile | 8 | ||||
| -rw-r--r-- | misc/Makefile | 6 | ||||
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | setjmp/Makefile | 7 | ||||
| -rw-r--r-- | stdio-common/Makefile | 7 | ||||
| -rw-r--r-- | stdlib/Makefile | 18 | ||||
| -rw-r--r-- | sysdeps/arm/soft-fp/sfp-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/arch-fork.h (renamed from sysdeps/unix/sysv/linux/arm/fork.c) | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/termios.h | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/termios.h | 19 |
15 files changed, 108 insertions, 77 deletions
@@ -1,8 +1,74 @@ +2014-05-17 David S. Miller <davem@davemloft.net> + + * sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP): + Protect with __USE_GNU. + (TIOCSET_TEMPT): Likewise. + (TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS, + TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as + these are already provided in bits/ioctl-types.h + 2014-05-16 Roland McGrath <roland@hack.frob.com> * sysdeps/unix/sysv/linux/alpha/arch-fork.h: New file. * sysdeps/unix/sysv/linux/ia64/nptl/fork.c: File removed. + * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): + Use wait4 regardless of [__NR_waitpid]. + +2014-05-16 Maciej W. Rozycki <macro@codesourcery.com> + + PR libgcc/60166 + * sysdeps/arm/soft-fp/sfp-machine.h (_FP_NANFRAC_S, _FP_NANFRAC_D) + (_FP_NANSIGN_Q): Set the quiet bit. + +2014-05-16 Joseph Myers <joseph@codesourcery.com> + + * benchtests/Makefile + ($(addprefix $(objpfx)bench-,$(bench-math))): Depend on $(libm), + not $(common-objpfx)math/libm.so. + ($(addprefix $(objpfx)bench-,$(bench-pthread))): Depend on + $(shared-thread-library), not $(common-objpfx)nptl/libpthread.so. + * elf/Makefile ($(objpfx)noload): Depend on $(libdl), not + $(common-objpfx)dlfcn/libdl.so. + ($(objpfx)tst-audit8): Depend on $(libm), not + $(common-objpfx)math/libm.so. + * malloc/Makefile ($(objpfx)libmemusage.so): Depend on $(libdl), + not $(common-objpfx)dlfcn/libdl.so. + * math/Makefile + ($(addprefix $(objpfx),$(filter-out $(tests-static),$(tests)))): + Depend on $(libm), not $(objpfx)libm.so. Do not condition on + [$(build-shared) = yes]. + ($(objpfx)test-fenv-tls): Depend on $(shared-thread-library), not + $(common-objpfx)nptl/libpthread.so. + * misc/Makefile ($(objpfx)tst-tsearch): Depend on $(libm), not + $(common-objpfx)math/libm.so$(libm.so-version) or + $(common-objpfx)math/libm.a depending on [$(build-shared) = yes]. + * nptl/Makefile ($(objpfx)tst-unload): Depend on $(libdl), not + $(common-objpfx)dlfcn/libdl.so. + * setjmp/Makefile (link-libm): Remove variable. + ($(objpfx)tst-setjmp-fp): Depend on $(libm), not $(link-libm). + * stdio-common/Makefile (link-libm): Remove variable. + ($(objpfx)tst-printf-round): Depend on $(libm), not $(link-libm). + * stdlib/Makefile (link-libm): Remove variable. + ($(objpfx)bug-getcontext): Depend on $(libm), not $(link-libm). + ($(objpfx)tst-strtod-round): Likewise. + ($(objpfx)tst-tininess): Likewise. + ($(objpfx)tst-strtod-underflow): Likewise. + ($(objpfx)tst-strtod6): Likewise. + ($(objpfx)tst-tls-atexit): Depend on $(shared-thread-library) and + $(libdl), not $(common-objpfx)nptl/libpthread.so and + $(common-objpfx)dlfcn/libdl.so. + +2014-05-16 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + + * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC]: Guard + BSD terminal modes definitions. + +2014-05-16 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/arm/arch-fork.h: New file. + * sysdeps/unix/sysv/linux/arm/fork.c: File removed. + * sysdeps/unix/sysv/linux/arch-fork.h: New file. * sysdeps/unix/sysv/linux/i386/fork.h: Moved ... * sysdeps/unix/sysv/linux/i386/arch-fork.h: ... here. diff --git a/benchtests/Makefile b/benchtests/Makefile index a0954cdbc7..63a5a7fd6b 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -44,9 +44,8 @@ benchset := $(string-bench-all) $(stdlib-bench) CFLAGS-bench-ffs.c += -fno-builtin CFLAGS-bench-ffsll.c += -fno-builtin -$(addprefix $(objpfx)bench-,$(bench-math)): $(common-objpfx)math/libm.so -$(addprefix $(objpfx)bench-,$(bench-pthread)): \ - $(common-objpfx)nptl/libpthread.so +$(addprefix $(objpfx)bench-,$(bench-math)): $(libm) +$(addprefix $(objpfx)bench-,$(bench-pthread)): $(shared-thread-library) diff --git a/elf/Makefile b/elf/Makefile index 084abcaf2c..4dcc78a163 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -653,7 +653,7 @@ $(objpfx)vismain: $(addprefix $(objpfx),vismod1.so vismod2.so) $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) -$(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so +$(objpfx)noload: $(objpfx)testobj1.so $(libdl) LDFLAGS-noload = -rdynamic $(no-as-needed) $(objpfx)noload.out: $(objpfx)testobj5.so @@ -1011,7 +1011,7 @@ $(objpfx)tst-audit9: $(libdl) $(objpfx)tst-audit9.out: $(objpfx)tst-auditmod9a.so $(objpfx)tst-auditmod9b.so tst-audit9-ENV = LD_AUDIT=$(objpfx)tst-auditmod9a.so -$(objpfx)tst-audit8: $(common-objpfx)math/libm.so +$(objpfx)tst-audit8: $(libm) $(objpfx)tst-audit8.out: $(objpfx)tst-auditmod1.so tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so diff --git a/malloc/Makefile b/malloc/Makefile index d962331e12..7a716f983f 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -148,7 +148,7 @@ $(objpfx)memusage: memusage.sh # The implementation uses `dlsym' -$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so +$(objpfx)libmemusage.so: $(libdl) # Extra dependencies $(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c diff --git a/math/Makefile b/math/Makefile index c13ca80cf8..f337a0ef54 100644 --- a/math/Makefile +++ b/math/Makefile @@ -219,12 +219,8 @@ $(objpfx)libieee.a: $(objpfx)ieee-math.o $(patsubst %/,cd % &&,$(objpfx)) \ $(LN_S) $(<F) $(@F) -ifeq ($(build-shared),yes) -$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(objpfx)libm.so$(libm.so-version) +$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(libm) $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a -else -$(addprefix $(objpfx),$(tests)): $(objpfx)libm.a -endif gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\ add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \ @@ -233,4 +229,4 @@ gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\ $(objpfx)atest-exp: $(gmp-objs) $(objpfx)atest-sincos: $(gmp-objs) $(objpfx)atest-exp2: $(gmp-objs) -$(objpfx)test-fenv-tls: $(common-objpfx)nptl/libpthread.so +$(objpfx)test-fenv-tls: $(shared-thread-library) diff --git a/misc/Makefile b/misc/Makefile index 53d4c2ce44..edac24cfc2 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -102,11 +102,7 @@ include ../Rules $(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib) -ifeq ($(build-shared),yes) -$(objpfx)tst-tsearch: $(common-objpfx)math/libm.so$(libm.so-version) -else -$(objpfx)tst-tsearch: $(common-objpfx)math/libm.a -endif +$(objpfx)tst-tsearch: $(libm) tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace tst-error1-ARGS = $(objpfx)tst-error1.out diff --git a/nptl/Makefile b/nptl/Makefile index 287622475d..7551406cfb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -530,7 +530,7 @@ $(addprefix $(objpfx), \ $(tests-nolibpthread), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a -$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so +$(objpfx)tst-unload: $(libdl) # $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so, # since otherwise libpthread.so comes before libc.so when linking. $(addprefix $(objpfx), $(tests-reverse)): \ diff --git a/setjmp/Makefile b/setjmp/Makefile index fe0fb5dc6d..047b9ec9f2 100644 --- a/setjmp/Makefile +++ b/setjmp/Makefile @@ -33,9 +33,4 @@ tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \ include ../Rules -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)tst-setjmp-fp: $(link-libm) +$(objpfx)tst-setjmp-fp: $(libm) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 332f205bcf..f179eab508 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -137,9 +137,4 @@ $(objpfx)tst-setvbuf1-cmp.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1.out cmp $^ > $@; \ $(evaluate-test) -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)tst-printf-round: $(link-libm) +$(objpfx)tst-printf-round: $(libm) diff --git a/stdlib/Makefile b/stdlib/Makefile index 42482a2a6c..d7a562f6dc 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -150,19 +150,13 @@ $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps) $(build-module) CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)bug-getcontext: $(link-libm) -$(objpfx)tst-strtod-round: $(link-libm) -$(objpfx)tst-tininess: $(link-libm) -$(objpfx)tst-strtod-underflow: $(link-libm) -$(objpfx)tst-strtod6: $(link-libm) +$(objpfx)bug-getcontext: $(libm) +$(objpfx)tst-strtod-round: $(libm) +$(objpfx)tst-tininess: $(libm) +$(objpfx)tst-strtod-underflow: $(libm) +$(objpfx)tst-strtod6: $(libm) tst-tls-atexit-lib.so-no-z-defs = yes -$(objpfx)tst-tls-atexit: $(common-objpfx)nptl/libpthread.so \ - $(common-objpfx)dlfcn/libdl.so +$(objpfx)tst-tls-atexit: $(shared-thread-library) $(libdl) $(objpfx)tst-tls-atexit.out: $(objpfx)tst-tls-atexit-lib.so diff --git a/sysdeps/arm/soft-fp/sfp-machine.h b/sysdeps/arm/soft-fp/sfp-machine.h index 32697fef44..2e7c156294 100644 --- a/sysdeps/arm/soft-fp/sfp-machine.h +++ b/sysdeps/arm/soft-fp/sfp-machine.h @@ -21,9 +21,9 @@ #define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y) #define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) -#define _FP_NANFRAC_S 0 -#define _FP_NANFRAC_D 0, 0 -#define _FP_NANFRAC_Q 0, 0, 0, 0 +#define _FP_NANFRAC_S _FP_QNANBIT_S +#define _FP_NANFRAC_D _FP_QNANBIT_D, 0 +#define _FP_NANFRAC_Q _FP_QNANBIT_Q, 0, 0, 0 #define _FP_NANSIGN_S 0 #define _FP_NANSIGN_D 0 #define _FP_NANSIGN_Q 0 diff --git a/sysdeps/unix/sysv/linux/arm/fork.c b/sysdeps/unix/sysv/linux/arm/arch-fork.h index 0fbea176c3..9fd1d5d046 100644 --- a/sysdeps/unix/sysv/linux/arm/fork.c +++ b/sysdeps/unix/sysv/linux/arm/arch-fork.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2005-2014 Free Software Foundation, Inc. +/* ARCH_FORK definition for Linux fork implementation. ARM version. + Copyright (C) 2014 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Phil Blundell <pb@nexus.co.uk>, 2005 The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -13,18 +13,15 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see + License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ #include <sched.h> -#include <signal.h> #include <sysdep.h> #include <tls.h> -#define ARCH_FORK() \ - INLINE_SYSCALL (clone, 5, \ - CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, \ - NULL, NULL, NULL, &THREAD_SELF->tid) - -#include <nptl/sysdeps/unix/sysv/linux/fork.c> +#define ARCH_FORK() \ + INLINE_SYSCALL (clone, 5, \ + CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, \ + NULL, NULL, NULL, &THREAD_SELF->tid) diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index bc17107239..14f5e8bd8b 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -83,13 +83,8 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, __fcntl_nocancel (fd, cmd, val) /* Uncancelable waitpid. */ -#ifdef __NR_waitpid -# define waitpid_not_cancel(pid, stat_loc, options) \ - __waitpid_nocancel (pid, stat_loc, options) -#else -# define waitpid_not_cancel(pid, stat_loc, options) \ +#define waitpid_not_cancel(pid, stat_loc, options) \ INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) -#endif /* Uncancelable pause. */ #define pause_not_cancel() \ diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h index de57249ec4..b971d3c5f0 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h @@ -95,8 +95,10 @@ struct termios { # define NLDLY 00001400 # define NL0 00000000 # define NL1 00000400 -# define NL2 00001000 -# define NL3 00001400 +# if defined __USE_MISC +# define NL2 00001000 +# define NL3 00001400 +# endif # define TABDLY 00006000 # define TAB0 00000000 # define TAB1 00002000 @@ -222,6 +224,8 @@ struct termios { #define TCSADRAIN 1 #define TCSAFLUSH 2 +#ifdef __USE_MISC + struct sgttyb { char sg_ispeed; char sg_ospeed; @@ -257,6 +261,7 @@ struct ltchars { #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 + struct winsize { unsigned short ws_row; unsigned short ws_col; @@ -319,3 +324,5 @@ struct termio { #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ #define N_HCI 15 /* Bluetooth HCI UART */ + +#endif /* __USE_MISC */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h index 94524b32b8..b7a103b3a2 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h @@ -107,8 +107,11 @@ struct termios #define VTDLY 0x00004000 #define VT0 0x00000000 #define VT1 0x00004000 + +# if defined __USE_GNU #define PAGEOUT 0x00010000 /* SUNOS specific */ #define WRAP 0x00020000 /* SUNOS specific */ +# endif #ifdef __USE_MISC # define XTABS 0x00001800 @@ -200,22 +203,10 @@ struct termios # define EXTPROC 0x00010000 #endif -/* modem lines */ -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG - +# if defined __USE_GNU /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ - +#endif /* tcflow() and TCXONC use these */ #define TCOOFF 0 |