aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-22 22:06:08 +0000
committerRoland McGrath <roland@gnu.org>1996-06-22 22:06:08 +0000
commit072ebcefb24864ff922bc83f8aa270b799c73ba6 (patch)
treecd612b3a52cb50136ca91cea62c10a920e38af4e
parent40a4b79f218755001f6a26438f4dd573a29734dc (diff)
downloadglibc-072ebcefb24864ff922bc83f8aa270b799c73ba6.zip
glibc-072ebcefb24864ff922bc83f8aa270b799c73ba6.tar.gz
glibc-072ebcefb24864ff922bc83f8aa270b799c73ba6.tar.bz2
* version.h (VERSION): Version 1.92 test release.
* misc/Makefile (headers): Add ar.h. * misc/ar.h: New file. * config.make.in (BUILD_CC): New variable. * configure.in: Check for BUILD_CC if $host != $build. * posix/glob.c: Include <alloca.h> only [HAVE_ALLOCA_H], not [sparc]. * Makerules [! objects] (subdir_lib): Depend on the stamp$o files. (stamp$o files): New targets, create them empty, no deps. Update from bind-4.9.4-T3B.
-rw-r--r--ChangeLog15
-rw-r--r--Makerules8
-rw-r--r--config.make.in1
-rw-r--r--configure.in3
-rw-r--r--misc/Makefile4
-rw-r--r--misc/ar.h42
-rw-r--r--posix/glob.c4
-rw-r--r--version.h2
8 files changed, 72 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d37ec6..7faf1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
Sat Jun 22 10:44:09 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+ * version.h (VERSION): Version 1.92 test release.
+
+ * misc/Makefile (headers): Add ar.h.
+ * misc/ar.h: New file.
+
+ * config.make.in (BUILD_CC): New variable.
+ * configure.in: Check for BUILD_CC if $host != $build.
+
+ * posix/glob.c: Include <alloca.h> only [HAVE_ALLOCA_H], not [sparc].
+
+ * Makerules [! objects] (subdir_lib): Depend on the stamp$o files.
+ (stamp$o files): New targets, create them empty, no deps.
+
* rpm/template (Source): New field.
(%prep, %build, %install): New sections.
(%files): Add %doc FAQ NEWS NOTES README.
@@ -1981,7 +1994,7 @@ Thu May 23 23:09:33 1996 Ulrich Drepper <drepper@cygnus.com>
* FAQ: Add answer for 100% source code compatibility to Linux
libc by David Mosberger-Tang.
- Update from bind-4.3.4-T3B.
+ Update from bind-4.9.4-T3B.
* inet/arpa/inet.h: Add prototypes for inet_pton, inet_ntop,
inet_nsap_addr, and inet_nsap_ntoa.
* resolv/gethnamaddr.c: Correct compatibility problems (sprintf),
diff --git a/Makerules b/Makerules
index f995fe3..7f4b5fd 100644
--- a/Makerules
+++ b/Makerules
@@ -375,7 +375,13 @@ libobjs: $(foreach o,$(object-suffixes),\
lib-noranlib: libobjs
others: $(addprefix $(objpfx),$(install-lib))
-ifdef objects
+ifndef objects
+
+# Create the stamp$o files to keep the parent makefile happy.
+subdir_lib: $(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir))
+$(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir)):
+ rm -f $@; > $@
+else
# Define a pattern rule that will match many targets libc.a(foo.%), for
# each foo.o in $(objects) (% will just happen always to match `o'). This is
diff --git a/config.make.in b/config.make.in
index d880a63..2454003 100644
--- a/config.make.in
+++ b/config.make.in
@@ -30,6 +30,7 @@ stdio = @stdio@
# Build tools.
CC = @CC@
+BUILD_CC = @BUILD_CC@
CFLAGS = @CFLAGS@
AR = @AR@
RANLIB = @RANLIB@
diff --git a/configure.in b/configure.in
index 38efc2e..610d5e8 100644
--- a/configure.in
+++ b/configure.in
@@ -295,6 +295,9 @@ AC_PROG_LN_S
AC_CHECK_PROGS(MSGFMT, msgfmt gmsgfmt, :)
AC_CHECK_TOOL(CC, gcc)
+if test $host != $build; then
+ AC_CHECK_PROG(BUILD_CC, gcc cc)
+fi
AC_PROG_CPP
AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib, :)
diff --git a/misc/Makefile b/misc/Makefile
index 3dff4ae..b99d3a3 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -23,8 +23,8 @@
subdir := misc
headers := sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \
- sys/ptrace.h sys/file.h \
- a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \
+ sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
+ ar.h a.out.h nlist.h stab.h stab.def sgtty.h \
ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \
sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h
diff --git a/misc/ar.h b/misc/ar.h
new file mode 100644
index 0000000..80d0144
--- /dev/null
+++ b/misc/ar.h
@@ -0,0 +1,42 @@
+/* Header describing `ar' archive file format.
+Copyright (C) 1996 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
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+#ifndef _AR_H
+#define _AR_H 1
+
+/* Archive files start with the ARMAG identifying string. Then follows a
+ `struct ar_hdr', and as many bytes of member file data as its `ar_size'
+ member indicates, for each member file. */
+
+#define ARMAG "!<arch>\n" /* String that begins an archive file. */
+#define SARMAG 8 /* Size of that string. */
+
+#define ARFMAG "`\n" /* String in ar_fmag at end of each header. */
+
+struct ar_hdr
+ {
+ char ar_name[16]; /* Member file name, sometimes / terminated. */
+ char ar_date[12]; /* File date, decimal seconds since Epoch. */
+ char ar_uid[6], ar_gid[6]; /* User and group IDs, in ASCII decimal. */
+ char ar_mode[8]; /* File mode, in ASCII octal. */
+ char ar_size[10]; /* File size, in ASCII decimal. */
+ char ar_fmag[2]; /* Always contains ARFMAG. */
+ };
+
+#endif /* ar.h */
diff --git a/posix/glob.c b/posix/glob.c
index ff015fc..d6635fc 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -188,9 +188,9 @@ my_realloc (p, n)
#undef alloca
#define alloca(n) __builtin_alloca (n)
#else /* Not GCC. */
-#if defined (sparc) || defined (HAVE_ALLOCA_H)
+#ifdef HAVE_ALLOCA_H
#include <alloca.h>
-#else /* Not sparc or HAVE_ALLOCA_H. */
+#else /* Not HAVE_ALLOCA_H. */
#ifndef _AIX
extern char *alloca ();
#endif /* Not _AIX. */
diff --git a/version.h b/version.h
index 01ee5f3..3ea8184e 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
#define RELEASE "alpha"
-#define VERSION "1.91"
+#define VERSION "1.92"