From: Arun Thomas <arun@minix3.org>
Date: Wed, 26 May 2010 18:45:55 +0000 (+0000)
Subject: GCC build fixes/updates
X-Git-Tag: v3.1.7~31
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.pdf?a=commitdiff_plain;h=007104d60e6a6ff93358ef9d252ee550ff58564f;p=minix.git

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 36f8b1445..f9c8da9f9 100644
--- 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 e31fd4e52..ee5310209 100644
--- 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 fb2e197bc..0bf9d442f 100644
--- 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 916d1a059..3ca62ae3f 100644
--- 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 ba78904f9..88da36726 100644
--- 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 80341ce29..2b83ee444 100644
--- 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 0ab3668a9..f422a6da2 100644
--- 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 3fc6b1c35..aa8b54dbc 100644
--- 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 9490587d2..278765a48 100644
--- 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 37719626d..133b31fa3 100644
--- 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 a5fc8f799..f07350e60 100644
--- 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 6b69cb5a1..7fd5f23e3 100644
--- 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 12ce12975..b493d0682 100644
--- 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}