GCC build fixes/updates

-Set stack sizes for boot image processes
-Increase RS stack size
-Reduce ramdisk size
-HARDWARE task should use kernel stack
-Minor asm tweaks for leading underscores

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 36f8b144557e789d229528d6fab278e921c27677..f9c8da9f9837d1302ff1c9ad7daa98f204c93e0e 100644 (file)
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -8,5 +8,6 @@ LDADD+= -ldriver -lsys
 MAN=
 
 BINDIR?= /sbin
+INSTALLFLAGS+= -S 32k
 
 .include <minix.prog.mk>

diff --git a/drivers/memory/memory_driver/Makefile b/drivers/memory/memory_driver/Makefile
index e31fd4e521f458dbd53097a374751c91733c5ba0..ee5310209ceabd33d78e3d584ba26dc479e09e73 100644 (file)
--- a/drivers/memory/memory_driver/Makefile
+++ b/drivers/memory/memory_driver/Makefile
@@ -10,6 +10,7 @@ LDADD+=       -ldriver -lsys
 MAN=
 
 BINDIR?= /usr/sbin
+INSTALLFLAGS+= -S 8k
 
 CPPFLAGS.memory.c+=    -I${MINIXSRCDIR}
 CPPFLAGS.imgrd.c+=     -I${.CURDIR}/../ramdisk -T /usr/tmp

diff --git a/drivers/memory/ramdisk/proto b/drivers/memory/ramdisk/proto
index fb2e197bc3abf34732992642b24875b9f5275bb2..0bf9d442f050a037c1909e811eb265ffd3516085 100644 (file)
--- a/drivers/memory/ramdisk/proto
+++ b/drivers/memory/ramdisk/proto
@@ -1,5 +1,5 @@
 boot 
-500 400
+235 400
 d--755 0 0
        bin d--755 0 0
                at_wini ---755 0 0 at_wini

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 916d1a059b56df89bafdd6828df9f33f8bad3f1d..3ca62ae3f6f162f153d1cbd01adfd4156877073a 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -11,6 +11,7 @@ LDADD+=       -ldriver -lsys -ltimers
 MAN=
 
 BINDIR?= /sbin
+INSTALLFLAGS+= -S 16k
 
 SUBDIR= keymaps
 

diff --git a/kernel/arch/i386/klib.S b/kernel/arch/i386/klib.S
index ba78904f9f4fbedb0b9e6ac56fb9ecfeeff4e29b..88da3672641fbd02af3de3b6d5c7846327b3db4c 100644 (file)
--- a/kernel/arch/i386/klib.S
+++ b/kernel/arch/i386/klib.S
@@ -29,7 +29,7 @@
 .globl _phys_copy_fault        /* phys_copy pagefault */
 .globl _phys_copy_fault_in_kernel /* phys_copy pagefault in kernel */
 .globl _phys_memset    /* write pattern anywhere in memory */
-.globl mem_rdw /* copy one word from [segment:offset] */
+.globl _mem_rdw        /* copy one word from [segment:offset] */
 .globl _reset  /* reset the system */
 .globl _halt_cpu/* halts the current cpu when idle */
 .globl _read_cpu_flags /* read the cpu flags */
@@ -575,7 +575,7 @@ fill_done:
  */
 
 .balign        16
-mem_rdw:
+_mem_rdw:
        mov     %ds, %cx
        mov     4(%esp), %ds
        mov     4+4(%esp), %eax /* offset */

diff --git a/kernel/arch/i386/mpx.S b/kernel/arch/i386/mpx.S
index 80341ce296b37d86dadf893aa224fc99a2826d22..2b83ee444b3cbbcfcf1749874886b59f6cc81083 100644 (file)
--- a/kernel/arch/i386/mpx.S
+++ b/kernel/arch/i386/mpx.S
@@ -117,7 +117,7 @@ begbss:
 /*===========================================================================*/
 /*                             MINIX                                        */
 /*===========================================================================*/
-.global MINIX
+.globl MINIX
 MINIX:
 /* this is the entry point for the MINIX kernel */
        jmp     over_flags      /* skip over the next few bytes */
@@ -731,6 +731,6 @@ _reload_cr3:
  * the kernel stack
  */
 .globl _k_boot_stktop
-_k_boot_stack:
+k_boot_stack:
 .space 4096            /* kernel stack */ /* FIXME use macro here */
 _k_boot_stktop:                /* top of kernel stack */

diff --git a/kernel/table.c b/kernel/table.c
index 0ab3668a9d636452b98b6de43a091b79eb2073a8..f422a6da2b6d7f5166cc257cfd711c4282cd98f9 100644 (file)
--- a/kernel/table.c
+++ b/kernel/table.c
@@ -69,7 +69,7 @@ PUBLIC struct boot_image image[] = {
 {IDLE,             0,  0,      0, IDL_S, "idle"  },
 {CLOCK,            0,  0,      0, IDL_S, "clock" },
 {SYSTEM,           0,  0,      0, IDL_S, "system"},
-{HARDWARE,         0,  0,      0, IDL_S, "kernel"},
+{HARDWARE,         0,  0,      0, HRD_S, "kernel"},
 
 {DS_PROC_NR,   BVM_F, 50,      4, 0,     "ds"    },
 {RS_PROC_NR,       0, 50,      4, 0,     "rs"    },

diff --git a/servers/ds/Makefile b/servers/ds/Makefile
index 3fc6b1c3550b4d2a298e0711b0ca3a2c21b09cdc..aa8b54dbceb24f2c5f7b3cefc59d9ee70dfa217c 100644 (file)
--- a/servers/ds/Makefile
+++ b/servers/ds/Makefile
@@ -8,5 +8,6 @@ LDADD+= -lsys
 MAN=
 
 BINDIR?= /usr/sbin
+INSTALLFLAGS+= -S 16k
 
 .include <minix.prog.mk>

diff --git a/servers/init/Makefile b/servers/init/Makefile
index 9490587d2a0cad942d34719b09c631ef4d86267c..278765a48c9cd6181ec7c7e38c031301ee0c99df 100644 (file)
--- a/servers/init/Makefile
+++ b/servers/init/Makefile
@@ -8,6 +8,7 @@ LDADD+= -lsys
 MAN=
 
 BINDIR?= /usr/sbin
+INSTALLFLAGS+= -S 64k
 
 CPPFLAGS+= -O -D_MINIX -D_POSIX_SOURCE
 

diff --git a/servers/mfs/Makefile b/servers/mfs/Makefile
index 37719626d91f76591c59c2cb0c41fde7f9c7f395..133b31fa32c139b78d310a52ad895f846d515164 100644 (file)
--- a/servers/mfs/Makefile
+++ b/servers/mfs/Makefile
@@ -11,6 +11,7 @@ LDADD+=       -lsys
 MAN=
 
 BINDIR?= /sbin
+INSTALLFLAGS+= -S 128k
 
 DEFAULT_NR_BUFS= 1024
 CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}

diff --git a/servers/pfs/Makefile b/servers/pfs/Makefile
index a5fc8f7994326a641cca7400c6be35648dad286c..f07350e60c0e3523c09e9b5cfdabafd71a2d69fc 100644 (file)
--- a/servers/pfs/Makefile
+++ b/servers/pfs/Makefile
@@ -9,6 +9,7 @@ LDADD+= -lsys
 MAN=
 
 BINDIR?= /usr/sbin
+INSTALLFLAGS+= -S 128k
 
 NR_BUFS= 256
 CPPFLAGS+= -DNR_BUFS=${NR_BUFS}

diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index 6b69cb5a1da1c8c62d23644201fd1fa99141208e..7fd5f23e30699b1dcebeedf07b55318d41e80620 100644 (file)
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -10,7 +10,7 @@ LDADD+=       -lsys
 MAN=
 
 BINDIR?= /usr/sbin
-INSTALLFLAGS+= -S 1050k
+INSTALLFLAGS+= -S 1225k
 
 CPPFLAGS+=     -I${MINIXSRCDIR}
 

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index 12ce1297557fffee236e655e5b9ca47c3d44c917..b493d0682e6e39c593516d741b09f0caaa9b0392 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -13,6 +13,7 @@ LDADD+=       -lsys
 MAN=
 
 BINDIR?= /usr/sbin
+INSTALLFLAGS+= -S 128k
 
 CPPFLAGS+= -I${.CURDIR} -Iarch/${ARCH}
 CPPFLAGS+=     -I${MINIXSRCDIR}