From a2b1a5134b59e2949ecdf476423ff948f11a81cd Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Thu, 12 Apr 2007 16:45:00 +0000 Subject: [PATCH] . leave out hardware-fp code from library . minor packman usage tweaks . kernel feature for printing version number . removed some verbose debug messages from vfs/mfs --- commands/scripts/packman.sh | 6 +++-- kernel/Makefile | 2 +- lib/ack/i386/em/Makefile.in | 24 -------------------- lib/ack/i386/em/{ => disconnected}/em_adf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_adf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_cff4.s | 0 lib/ack/i386/em/{ => disconnected}/em_cff8.s | 0 lib/ack/i386/em/{ => disconnected}/em_cfi.s | 0 lib/ack/i386/em/{ => disconnected}/em_cfu.s | 0 lib/ack/i386/em/{ => disconnected}/em_cif4.s | 0 lib/ack/i386/em/{ => disconnected}/em_cif8.s | 0 lib/ack/i386/em/{ => disconnected}/em_cmf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_cmf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_cuf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_cuf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_dvf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_dvf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_fef4.s | 0 lib/ack/i386/em/{ => disconnected}/em_fef8.s | 0 lib/ack/i386/em/{ => disconnected}/em_fif4.s | 0 lib/ack/i386/em/{ => disconnected}/em_fif8.s | 0 lib/ack/i386/em/{ => disconnected}/em_mlf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_mlf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_ngf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_ngf8.s | 0 lib/ack/i386/em/{ => disconnected}/em_sbf4.s | 0 lib/ack/i386/em/{ => disconnected}/em_sbf8.s | 0 servers/mfs/path.c | 1 - servers/vfs/mount.c | 1 - servers/vfs/path.c | 2 ++ 30 files changed, 7 insertions(+), 29 deletions(-) rename lib/ack/i386/em/{ => disconnected}/em_adf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_adf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cff4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cff8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cfi.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cfu.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cif4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cif8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cmf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cmf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cuf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_cuf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_dvf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_dvf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_fef4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_fef8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_fif4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_fif8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_mlf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_mlf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_ngf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_ngf8.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_sbf4.s (100%) rename lib/ack/i386/em/{ => disconnected}/em_sbf8.s (100%) diff --git a/commands/scripts/packman.sh b/commands/scripts/packman.sh index 037cee345..b62f2d2e0 100644 --- a/commands/scripts/packman.sh +++ b/commands/scripts/packman.sh @@ -46,14 +46,16 @@ cdpackages="" if [ -n "$cddrive" ] then pack=${cddrive}p2 umount $pack >/dev/null 2>&1 || true - if mount -r $pack $CDMP + echo "Checking for CD in $pack." + if mount -r $pack $CDMP 2>/dev/null then fn="$CDPACK/List" + echo "Found." cdpackages=$fn if [ ! -f $cdpackages ] then cdpackages="" echo "No package list found on CD in $fn." fi - else echo "CD mount failed." + else echo "Not found." fi else echo "Don't know where the install CD is. You can set it in $RC." fi diff --git a/kernel/Makefile b/kernel/Makefile index 1b5372614..f1e839735 100755 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -14,7 +14,7 @@ CC = exec cc CPP = $l/cpp LD = $(CC) -.o CPPFLAGS=-I$i -I$a/include -CFLAGS=$(CPROFILE) $(CPPFLAGS) +CFLAGS=$(CPROFILE) $(CPPFLAGS) $(EXTRA_OPTS) LDFLAGS=-i # first-stage, arch-dependent startup code diff --git a/lib/ack/i386/em/Makefile.in b/lib/ack/i386/em/Makefile.in index 793dc6fd0..6d3a67dc9 100644 --- a/lib/ack/i386/em/Makefile.in +++ b/lib/ack/i386/em/Makefile.in @@ -5,39 +5,21 @@ CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -Was-ack" LIBRARIES=libe libe_FILES=" \ - em_adf4.s \ - em_adf8.s \ em_adi.s \ em_and.s \ em_blm.s \ - em_cff4.s \ - em_cff8.s \ - em_cfi.s \ - em_cfu.s \ - em_cif4.s \ - em_cif8.s \ em_cii.s \ - em_cmf4.s \ - em_cmf8.s \ em_cms.s \ em_com.s \ em_csa4.s \ em_csb4.s \ - em_cuf4.s \ - em_cuf8.s \ em_cuu.s \ em_dup.s \ - em_dvf4.s \ - em_dvf8.s \ em_dvi.s \ em_dvu.s \ em_error.s \ em_exg.s \ em_fat.s \ - em_fef4.s \ - em_fef8.s \ - em_fif4.s \ - em_fif8.s \ em_fp8087.s \ em_gto.s \ em_hol0.s \ @@ -48,12 +30,8 @@ libe_FILES=" \ em_isar.s \ em_lar4.s \ em_loi.s \ - em_mlf4.s \ - em_mlf8.s \ em_mli.s \ em_mon.s \ - em_ngf4.s \ - em_ngf8.s \ em_ngi.s \ em_nop.s \ em_print.s \ @@ -63,8 +41,6 @@ libe_FILES=" \ em_rol.s \ em_ror.s \ em_sar4.s \ - em_sbf4.s \ - em_sbf8.s \ em_sbi.s \ em_set.s \ em_sli.s \ diff --git a/lib/ack/i386/em/em_adf4.s b/lib/ack/i386/em/disconnected/em_adf4.s similarity index 100% rename from lib/ack/i386/em/em_adf4.s rename to lib/ack/i386/em/disconnected/em_adf4.s diff --git a/lib/ack/i386/em/em_adf8.s b/lib/ack/i386/em/disconnected/em_adf8.s similarity index 100% rename from lib/ack/i386/em/em_adf8.s rename to lib/ack/i386/em/disconnected/em_adf8.s diff --git a/lib/ack/i386/em/em_cff4.s b/lib/ack/i386/em/disconnected/em_cff4.s similarity index 100% rename from lib/ack/i386/em/em_cff4.s rename to lib/ack/i386/em/disconnected/em_cff4.s diff --git a/lib/ack/i386/em/em_cff8.s b/lib/ack/i386/em/disconnected/em_cff8.s similarity index 100% rename from lib/ack/i386/em/em_cff8.s rename to lib/ack/i386/em/disconnected/em_cff8.s diff --git a/lib/ack/i386/em/em_cfi.s b/lib/ack/i386/em/disconnected/em_cfi.s similarity index 100% rename from lib/ack/i386/em/em_cfi.s rename to lib/ack/i386/em/disconnected/em_cfi.s diff --git a/lib/ack/i386/em/em_cfu.s b/lib/ack/i386/em/disconnected/em_cfu.s similarity index 100% rename from lib/ack/i386/em/em_cfu.s rename to lib/ack/i386/em/disconnected/em_cfu.s diff --git a/lib/ack/i386/em/em_cif4.s b/lib/ack/i386/em/disconnected/em_cif4.s similarity index 100% rename from lib/ack/i386/em/em_cif4.s rename to lib/ack/i386/em/disconnected/em_cif4.s diff --git a/lib/ack/i386/em/em_cif8.s b/lib/ack/i386/em/disconnected/em_cif8.s similarity index 100% rename from lib/ack/i386/em/em_cif8.s rename to lib/ack/i386/em/disconnected/em_cif8.s diff --git a/lib/ack/i386/em/em_cmf4.s b/lib/ack/i386/em/disconnected/em_cmf4.s similarity index 100% rename from lib/ack/i386/em/em_cmf4.s rename to lib/ack/i386/em/disconnected/em_cmf4.s diff --git a/lib/ack/i386/em/em_cmf8.s b/lib/ack/i386/em/disconnected/em_cmf8.s similarity index 100% rename from lib/ack/i386/em/em_cmf8.s rename to lib/ack/i386/em/disconnected/em_cmf8.s diff --git a/lib/ack/i386/em/em_cuf4.s b/lib/ack/i386/em/disconnected/em_cuf4.s similarity index 100% rename from lib/ack/i386/em/em_cuf4.s rename to lib/ack/i386/em/disconnected/em_cuf4.s diff --git a/lib/ack/i386/em/em_cuf8.s b/lib/ack/i386/em/disconnected/em_cuf8.s similarity index 100% rename from lib/ack/i386/em/em_cuf8.s rename to lib/ack/i386/em/disconnected/em_cuf8.s diff --git a/lib/ack/i386/em/em_dvf4.s b/lib/ack/i386/em/disconnected/em_dvf4.s similarity index 100% rename from lib/ack/i386/em/em_dvf4.s rename to lib/ack/i386/em/disconnected/em_dvf4.s diff --git a/lib/ack/i386/em/em_dvf8.s b/lib/ack/i386/em/disconnected/em_dvf8.s similarity index 100% rename from lib/ack/i386/em/em_dvf8.s rename to lib/ack/i386/em/disconnected/em_dvf8.s diff --git a/lib/ack/i386/em/em_fef4.s b/lib/ack/i386/em/disconnected/em_fef4.s similarity index 100% rename from lib/ack/i386/em/em_fef4.s rename to lib/ack/i386/em/disconnected/em_fef4.s diff --git a/lib/ack/i386/em/em_fef8.s b/lib/ack/i386/em/disconnected/em_fef8.s similarity index 100% rename from lib/ack/i386/em/em_fef8.s rename to lib/ack/i386/em/disconnected/em_fef8.s diff --git a/lib/ack/i386/em/em_fif4.s b/lib/ack/i386/em/disconnected/em_fif4.s similarity index 100% rename from lib/ack/i386/em/em_fif4.s rename to lib/ack/i386/em/disconnected/em_fif4.s diff --git a/lib/ack/i386/em/em_fif8.s b/lib/ack/i386/em/disconnected/em_fif8.s similarity index 100% rename from lib/ack/i386/em/em_fif8.s rename to lib/ack/i386/em/disconnected/em_fif8.s diff --git a/lib/ack/i386/em/em_mlf4.s b/lib/ack/i386/em/disconnected/em_mlf4.s similarity index 100% rename from lib/ack/i386/em/em_mlf4.s rename to lib/ack/i386/em/disconnected/em_mlf4.s diff --git a/lib/ack/i386/em/em_mlf8.s b/lib/ack/i386/em/disconnected/em_mlf8.s similarity index 100% rename from lib/ack/i386/em/em_mlf8.s rename to lib/ack/i386/em/disconnected/em_mlf8.s diff --git a/lib/ack/i386/em/em_ngf4.s b/lib/ack/i386/em/disconnected/em_ngf4.s similarity index 100% rename from lib/ack/i386/em/em_ngf4.s rename to lib/ack/i386/em/disconnected/em_ngf4.s diff --git a/lib/ack/i386/em/em_ngf8.s b/lib/ack/i386/em/disconnected/em_ngf8.s similarity index 100% rename from lib/ack/i386/em/em_ngf8.s rename to lib/ack/i386/em/disconnected/em_ngf8.s diff --git a/lib/ack/i386/em/em_sbf4.s b/lib/ack/i386/em/disconnected/em_sbf4.s similarity index 100% rename from lib/ack/i386/em/em_sbf4.s rename to lib/ack/i386/em/disconnected/em_sbf4.s diff --git a/lib/ack/i386/em/em_sbf8.s b/lib/ack/i386/em/disconnected/em_sbf8.s similarity index 100% rename from lib/ack/i386/em/em_sbf8.s rename to lib/ack/i386/em/disconnected/em_sbf8.s diff --git a/servers/mfs/path.c b/servers/mfs/path.c index cc583608a..0d5d41c36 100644 --- a/servers/mfs/path.c +++ b/servers/mfs/path.c @@ -243,7 +243,6 @@ printf("%s, %d\n", __FILE__, __LINE__); } else { put_inode(dir_ip); -printf("%s, %d\n", __FILE__, __LINE__); return(NIL_INODE); } } diff --git a/servers/vfs/mount.c b/servers/vfs/mount.c index cfa347665..a7b0b983f 100644 --- a/servers/vfs/mount.c +++ b/servers/vfs/mount.c @@ -294,7 +294,6 @@ PRIVATE int mount_fs(endpoint_t fs_e) /* Issue request */ if ((r = req_readsuper(&sreq, &sres)) != OK) { - printf("VFSmount: reading superblock error dev: %d\n", dev); dev_close(dev); return r; } diff --git a/servers/vfs/path.c b/servers/vfs/path.c index c005911d6..7283b4acb 100644 --- a/servers/vfs/path.c +++ b/servers/vfs/path.c @@ -316,9 +316,11 @@ struct vnode **vpp; if (res.inode_nr == 0) { +#if 0 printf("lookup_vp: lookup returned no inode\n"); printf("lookup_res = %d, last = '%s'\n\n", lookup_res, lookup_req->lastc); +#endif *vpp= NULL; return lookup_res; } -- 2.44.0