* Makerules (elfobjdir): Use $(objdir) if set, even in elf subdir.

* elf/Makefile (routines): Remove init-first.
	* csu/Makefile (routines): New variable; put it here instead.

	* config.make.in (CFLAGS): New variable.

	* io/sys/stat.h (S_ISLNK, S_ISSOCK): Make conditional on __USE_BSD,
	not __USE_GNU.
	* string/string.h (strncasecmp): Likewise.
This commit is contained in:
Roland McGrath 1996-06-12 01:34:32 +00:00
parent a89d30d444
commit 6e86a7c21b
7 changed files with 20 additions and 12 deletions

View File

@ -1,5 +1,16 @@
Tue Jun 11 15:09:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Makerules (elfobjdir): Use $(objdir) if set, even in elf subdir.
* elf/Makefile (routines): Remove init-first.
* csu/Makefile (routines): New variable; put it here instead.
* config.make.in (CFLAGS): New variable.
* io/sys/stat.h (S_ISLNK, S_ISSOCK): Make conditional on __USE_BSD,
not __USE_GNU.
* string/string.h (strncasecmp): Likewise.
* elf/Makefile (lib-noranlib): Move rule adding deps for ld.so et al
to after `include ../Rules', so $(rtld-installed-name) is defined.

View File

@ -493,11 +493,7 @@ LDFLAGS-c.so = -nostdlib -nostartfiles
# Give libc.so an entry point and make it directly runnable itself.
LDFLAGS-c.so += -e __libc_print_version
# Use our own special initializer and finalizer files for libc.so.
ifeq (elf, $(subdir))
elfobjdir := .
else
elfobjdir := $(firstword $(objdir) $(..)elf)
endif
elfobjdir := $(firstword $(objdir) $(patsubst ../$(subdir),.,$(..)elf))
$(common-objpfx)libc.so: $(elfobjdir)/soinit.so \
$(common-objpfx)libc_pic.a \
$(elfobjdir)/sofini.so $(elfobjdir)/ld.so

View File

@ -30,6 +30,7 @@ stdio = @stdio@
# Build tools.
CC = @CC@
CFLAGS = @CFLAGS@
AR = @AR@
RANLIB = @RANLIB@
AS = $(CC) -c

View File

@ -27,6 +27,7 @@
subdir := csu
routines = init-first
csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
extra-objs = start.o gmon-start.o \
$(start-installed-name) g$(start-installed-name) \

View File

@ -21,8 +21,7 @@
subdir := elf
headers = elf.h elfclass.h link.h dlfcn.h
routines = init-first $(dl-routines) \
dl-open dl-close dl-symbol dl-support
routines = $(dl-routines) dl-open dl-close dl-symbol dl-support
# The core dynamic linking functions are in libc for the static and
# profiled libraries.

View File

@ -60,7 +60,7 @@ __BEGIN_DECLS
#define S_ISFIFO(mode) __S_ISTYPE((mode), __S_IFIFO)
#endif
#ifdef __USE_GNU
#ifdef __USE_BSD
#ifdef __S_IFLNK
#define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK)
#endif

View File

@ -184,16 +184,16 @@ extern int ffs __P ((int __i));
extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));
extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
/* Compare no more than N chars of S1 and S2, ignoring case. */
extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
size_t __n));
/* Return the next DELIM-delimited token from *STRINGP,
terminating it with a '\0', and update *STRINGP to point past it. */
extern char *strsep __P ((char **__stringp, __const char *__delim));
#endif
#ifdef __USE_GNU
/* Compare no more than N chars of S1 and S2, ignoring case. */
extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
size_t __n));
/* Return a string describing the meaning of the signal number in SIG. */
extern char *strsignal __P ((int __sig));