Page MenuHomeFreeBSD
Files F157469398

D43914.id134420.diff
No OneTemporary
Actions

D43914.id134420.diff
View Options

diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
--- a/stand/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
@@ -23,7 +23,7 @@
.ifdef(BOOT_BIOSDISK_DEBUG)
# Make the disk code more talkative
-CFLAGS+= -DDISK_DEBUG
+CFLAGS.biosdisk.c+= -DDISK_DEBUG
.endif
# terminal emulation
@@ -35,11 +35,7 @@
CFLAGS.bootinfo.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite
CFLAGS.vbe.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite
-# XXX: make alloca() useable
-CFLAGS+= -Dalloca=__builtin_alloca
-
-CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \
- -I${LDRSRC} -I${BOOTSRC}/i386/common \
+CFLAGS+= -I${LDRSRC} -I${BOOTSRC}/i386/common \
-I${SYSDIR}/contrib/dev/acpica/include
# Handle FreeBSD specific %b and %D printf format specifiers
diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
--- a/stand/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
@@ -155,6 +155,7 @@
{
uint8_t Node;
struct pnp_devNode *devNodeBuffer;
+ uint8_t buffer[max(pnp_NodeSize, sizeof(*devNodeBuffer))];
int result;
struct pnpinfo *pi;
int count;
@@ -163,7 +164,7 @@
if (biospnp_init())
return;
- devNodeBuffer = (struct pnp_devNode *)alloca(pnp_NodeSize);
+ devNodeBuffer = (struct pnp_devNode *)buffer;
Node = 0;
count = 1000;
while((Node != 0xff) && (count-- > 0)) {

File Metadata

Mime Type
text/plain
Expires
Fri, May 22, 7:33 PM (19 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33428936
Default Alt Text
D43914.id134420.diff (1 KB)

Event Timeline