summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1997-05-01 19:41:23 +0000
committerThomas Bushnell <thomas@gnu.org>1997-05-01 19:41:23 +0000
commit8ce8c5f627a89c1c386f537c41908191cecb7e73 (patch)
tree9b60bf5092ff1fa96977c635288ebf5ed665939f
parenteb666b002a1990e2a16150b22c0259db96bb4ef1 (diff)
1997-04-30 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>
* Makefile.in (clib-routines): Add htons not because it is necessary, but because libc5 systems will bring it in. (check-clib-routines): Tolerate extra weak symbols.
-rw-r--r--ChangeLog25
-rw-r--r--Makefile.in13
2 files changed, 30 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index bbb02a4..1dcc696 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+1997-04-30 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>
+
+ * Makefile.in (clib-routines): Add htons not because it is necessary,
+ but because libc5 systems will bring it in.
+ (check-clib-routines): Tolerate extra weak symbols.
+
+Wed Apr 30 14:12:12 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * Makefile.in: Delete duplicate rule for cross-mig.
+
+Mon Apr 28 12:09:53 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * Makefile.in (check): New target. Reported by
+ xtest@postman.epa.go.jp.
+
+ * i386/Drivers.in (ncr53c7xx): Change file name to 53c78xx.o.
+ * i386/i386at/gpl/linux/scsi/53c7,8xx.c: Moved to ...
+ * i386/i386at/gpl/linux/scsi/53c78xx.c: ... here.
+ * i386/Makefrag (linux-scsi-files): Change file name here too.
+ Reported by xtest@postman.epa.go.jp.
+
Wed Apr 23 14:35:44 1997 Miles Bader <miles@gnu.ai.mit.edu>
* ipc/ipc_entry.c [MACH_KDB]: Add include of <kern/task.h>.
@@ -9,7 +30,9 @@ Wed Apr 23 13:21:23 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* configure.in (kdb): New --enable option.
* Makefile.in (DEFINES): Add @DEFS@.
-
+ * bogus/mach_kdb.h: Make this file zero length; we get MACH_KDB
+ from configure now.
+
* Makefile.in (clean, distclean, mostlyclean, maintainter-clean):
New targets.
(all-archs-configures): New variable.
diff --git a/Makefile.in b/Makefile.in
index dd5f29f..b1c5421 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -230,7 +230,7 @@ other-headers := alloca.h
# for sanity.
objfiles += clib-routines.o
-clib-routines = memcpy memset bcopy bzero htonl ntohl ntohs
+clib-routines = memcpy memset bcopy bzero htonl htons ntohl ntohs
clib-routines.o: $(installed-clib)
$(LD) -o clib-routines.o -r $(addprefix -u ,$(clib-routines)) $(installed-clib)
@@ -239,7 +239,10 @@ clib-routines.o: $(installed-clib)
# extra symbols.
kernel: check-clib-routines
check-clib-routines: clib-routines.o
- test `echo $(clib-routines) | wc -w` -eq `nm -g $< | wc -l` && touch check-clib-routines
+ nm -g $< | awk '$(foreach sym,$(clib-routines),$$3 == "$(sym)" ||) 0 { match_cnt++ } \
+ $$2 == "W" { weak_cnt++ } \
+ { total_cnt++ } \
+ END { exit total_cnt - (match_cnt + weak_cnt) } ' && touch check-clib-routines
# Empty dependency file
@@ -301,6 +304,7 @@ mostlyclean: distclean
maintainer-clean: mostlyclean
rm -f $(srcdir)/configure $(all-archs-configures)
+check:
#
@@ -514,11 +518,6 @@ $(subst .o,.d,$(cross-mig-objfiles)): cross-%.d: $(srcdir)/mig/%.c
mv -f $@.new $@
endif
-./cross-mig: $(srcdir)/mig/mig.sh Makefile
- sed -e 's,@MIGDIR@,$(libexecdir),g' \
- -e 's,@CPP@,${CC} -x c-header -E,g' \
- $< >$@.tmp && chmod +x $@.tmp && mv -f $@.tmp $@
-
ifeq ($(cross_compiling),yes)
# When cross compiling, we build two migcoms; one for our use and one to
# install. Otherwise, we just build the one.