diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/inet/Makefile.in | 10 | ||||
| -rw-r--r-- | libc/misc/ctype/Makefile.in | 8 | ||||
| -rw-r--r-- | libc/signal/Makefile.in | 5 | ||||
| -rw-r--r-- | libc/signal/signal.c | 13 | ||||
| -rw-r--r-- | libc/stdlib/Makefile.in | 4 | ||||
| -rw-r--r-- | libc/string/strstr.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/mathcalls.h | 3 | ||||
| -rw-r--r-- | libc/unistd/Makefile.in | 4 |
8 files changed, 29 insertions, 20 deletions
diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in index 50ad210d9..8d0484e01 100644 --- a/libc/inet/Makefile.in +++ b/libc/inet/Makefile.in @@ -35,18 +35,16 @@ endif # multi source resolv.c resolv_CSRC += \ encodeh.c decodeh.c encoded.c decoded.c lengthd.c \ - encodeq.c decodeq.c lengthq.c encodea.c decodea.c \ + encodeq.c decodeq.c encodea.c decodea.c lengthq.c \ dnslookup.c opennameservers.c closenameservers.c \ read_etc_hosts_r.c get_hosts_byaddr_r.c get_hosts_byname_r.c \ getnameinfo.c \ gethostbyaddr_r.c gethostbyname_r.c gethostbyname2_r.c gethostent_r.c \ gethostbyaddr.c gethostbyname.c gethostbyname2.c gethostent.c \ res_init.c res_query.c res_comp.c ns_name.c \ - ethers.c _res_state.c -#FIXME! ethers.c is a separate file, not a part of resolv.c - !? + _res_state.c ifneq ($(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),) CSRC += $(resolv_CSRC) - ## # unused ATM ## CSRC += encodep.c decodep.c formquery.c endif @@ -61,6 +59,10 @@ ifeq ($(UCLIBC_HAS_SOCKET),y) CSRC += $(socketcalls_CSRC) opensock.c endif +ifneq ($(UCLIBC_HAS_SOCKET)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),) +CSRC += ethers.c +endif + INET_SRC := $(patsubst %.c,$(INET_DIR)/%.c,$(CSRC)) INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC)) diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index 29b63f3d1..3f307f093 100644 --- a/libc/misc/ctype/Makefile.in +++ b/libc/misc/ctype/Makefile.in @@ -7,11 +7,13 @@ # multi source ctype.c COM_SRC := \ - isalnum.c isalpha.c isascii.c iscntrl.c isdigit.c \ + isalnum.c isalpha.c iscntrl.c isdigit.c \ isgraph.c islower.c isprint.c ispunct.c isspace.c \ - isupper.c isxdigit.c toascii.c tolower.c toupper.c \ + isupper.c isxdigit.c tolower.c toupper.c \ isblank.c - +ifeq ($(UCLIBC_SUSV4_LEGACY),y) +COM_SRC += isascii.c toascii.c +endif CSRC := $(COM_SRC) ifeq ($(UCLIBC_HAS_CTYPE_TABLES),y) diff --git a/libc/signal/Makefile.in b/libc/signal/Makefile.in index 85dca1f78..854207829 100644 --- a/libc/signal/Makefile.in +++ b/libc/signal/Makefile.in @@ -7,7 +7,7 @@ CSRC := allocrtsig.c killpg.c raise.c sigaction.c sigaddset.c sigandset.c \ sigblock.c sigdelset.c sigempty.c sigfillset.c siggetmask.c \ - sigintr.c sigisempty.c sigismem.c sigjmp.c signal.c \ + sigisempty.c sigismem.c sigjmp.c signal.c \ sigorset.c sigpause.c sigsetmask.c sigsetops.c sigwait.c ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y) CSRC += sighold.c sigignore.c sigrelse.c sigset.c @@ -15,6 +15,9 @@ endif ifeq ($(UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL),y) CSRC += sysv_signal.c endif +ifeq ($(UCLIBC_SUSV4_LEGACY),y) +CSRC += sigintr.c +endif ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) CSRC:=$(filter-out raise.c sigaction.c,$(CSRC)) diff --git a/libc/signal/signal.c b/libc/signal/signal.c index f3dfa33fc..644617c15 100644 --- a/libc/signal/signal.c +++ b/libc/signal/signal.c @@ -22,15 +22,12 @@ #include <signal.h> #include <string.h> /* For the real memset prototype. */ -/* libc_hidden_proto(sigaction) */ - sigset_t _sigintr attribute_hidden; /* Set by siginterrupt. */ /* Set the handler for the signal SIG to HANDLER, returning the old handler, or SIG_ERR on error. */ -extern __typeof(bsd_signal) __bsd_signal; -attribute_hidden __sighandler_t -__bsd_signal (int sig, __sighandler_t handler) +__sighandler_t +signal (int sig, __sighandler_t handler) { struct sigaction act, oact; @@ -51,7 +48,7 @@ __bsd_signal (int sig, __sighandler_t handler) return oact.sa_handler; } -strong_alias(__bsd_signal,bsd_signal) -/* libc_hidden_proto(signal) */ -strong_alias(__bsd_signal,signal) libc_hidden_def(signal) +#ifdef __UCLIBC_SUSV3_LEGACY__ +strong_alias(signal,bsd_signal) +#endif diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in index c631f2e20..1f0ccdc2b 100644 --- a/libc/stdlib/Makefile.in +++ b/libc/stdlib/Makefile.in @@ -10,7 +10,7 @@ include $(top_srcdir)libc/stdlib/malloc-simple/Makefile.in include $(top_srcdir)libc/stdlib/malloc-standard/Makefile.in CSRC := \ - abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c \ + abort.c getenv.c mkdtemp.c realpath.c mkstemp.c \ rand.c random.c random_r.c setenv.c div.c ldiv.c lldiv.c \ getpt.c drand48-iter.c jrand48.c \ jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \ @@ -31,7 +31,7 @@ endif ifeq ($(UCLIBC_HAS_FLOATS),y) CSRC += drand48.c drand48_r.c erand48.c erand48_r.c ifeq ($(UCLIBC_SUSV3_LEGACY),y) -CSRC += gcvt.c +CSRC += gcvt.c mktemp.c endif endif diff --git a/libc/string/strstr.c b/libc/string/strstr.c index 05712e62b..11417fb78 100644 --- a/libc/string/strstr.c +++ b/libc/string/strstr.c @@ -39,6 +39,6 @@ Wchar *Wstrstr(const Wchar *s1, const Wchar *s2) } #ifndef WANT_WIDE libc_hidden_def(strstr) -#else +#elif defined __UCLIBC_SUSV3_LEGACY__ strong_alias(wcsstr,wcswcs) #endif diff --git a/libc/sysdeps/linux/common/bits/mathcalls.h b/libc/sysdeps/linux/common/bits/mathcalls.h index 9241dd26d..1f2894fa5 100644 --- a/libc/sysdeps/linux/common/bits/mathcalls.h +++ b/libc/sysdeps/linux/common/bits/mathcalls.h @@ -358,7 +358,8 @@ __MATHCALLI (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z)); __END_NAMESPACE_C99 #endif -#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED +#if (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) \ + && defined __UCLIBC_SUSV3_LEGACY__ /* Return X times (2 to the Nth power). */ __MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n)); #endif diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index b447a85e1..f6ef98cf0 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -33,6 +33,10 @@ else CSRC := $(filter-out getsubopt.c,$(CSRC)) endif +ifneq ($(UCLIBC_SUSV3_LEGACY),y) +CSRC := $(filter-out ualarm.c usleep.c,$(CSRC)) +endif + ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) CSRC := $(filter-out sleep.c,$(CSRC)) endif |