Page MenuHomeFreeBSD
Files F138017878

D15628.diff
No OneTemporary
Actions

D15628.diff
View Options

Index: head/stand/common/boot.c
===================================================================
--- head/stand/common/boot.c
+++ head/stand/common/boot.c
@@ -36,6 +36,7 @@
#include "bootstrap.h"
+static int autoboot(int timeout, char *prompt);
static char *getbootfile(int try);
static int loadakernel(int try, int argc, char* argv[]);
@@ -157,7 +158,7 @@
autoboot(-1, NULL); /* try to boot automatically */
}
-int
+static int
autoboot(int timeout, char *prompt)
{
time_t when, otime, ntime;
Index: head/stand/common/bootstrap.h
===================================================================
--- head/stand/common/bootstrap.h
+++ head/stand/common/bootstrap.h
@@ -61,7 +61,6 @@
int parse(int *argc, char ***argv, const char *str);
/* boot.c */
-int autoboot(int timeout, char *prompt);
void autoboot_maybe(void);
int getrootmount(char *rootdev);
Index: head/stand/defs.mk
===================================================================
--- head/stand/defs.mk
+++ head/stand/defs.mk
@@ -91,7 +91,7 @@
# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here
# and activate it when DO32 is explicitly defined to be 1.
.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
-CFLAGS+= -m32 -mcpu=i386
+CFLAGS+= -m32
# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
LD_FLAGS+= -m elf_i386_fbsd
AFLAGS+= --32
Index: head/stand/i386/gptboot/Makefile
===================================================================
--- head/stand/i386/gptboot/Makefile
+++ head/stand/i386/gptboot/Makefile
@@ -37,7 +37,7 @@
-Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline -Wno-pointer-sign
+ -Wno-pointer-sign
CFLAGS.gcc+= --param max-inline-insns-single=100
Index: head/stand/i386/gptzfsboot/Makefile
===================================================================
--- head/stand/i386/gptzfsboot/Makefile
+++ head/stand/i386/gptzfsboot/Makefile
@@ -37,7 +37,7 @@
-Wall -Waggregate-return -Wbad-function-cast \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline -Wno-pointer-sign
+ -Wno-pointer-sign
CFLAGS.clang+= -Wno-tentative-definition-incomplete-type
Index: head/stand/i386/isoboot/Makefile
===================================================================
--- head/stand/i386/isoboot/Makefile
+++ head/stand/i386/isoboot/Makefile
@@ -36,6 +36,9 @@
-Winline -Wno-pointer-sign
CFLAGS.gcc+= --param max-inline-insns-single=100
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
+CFLAGS.gcc+= -Wno-uninitialized
+.endif
CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL}
LD_FLAGS+=${LD_FLAGS_BIN}
Index: head/stand/i386/zfsboot/Makefile
===================================================================
--- head/stand/i386/zfsboot/Makefile
+++ head/stand/i386/zfsboot/Makefile
@@ -34,8 +34,7 @@
-I${BOOTSRC}/i386/boot2 \
-Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
- -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
CFLAGS.gcc+= --param max-inline-insns-single=100
.if ${MACHINE} == "amd64"

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 29, 5:06 AM (2 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26318461
Default Alt Text
D15628.diff (3 KB)

Event Timeline