Commit 9e6abd2a authored by Josh Triplett's avatar Josh Triplett

x86, boot: Don't compile aslr.c when !CONFIG_RANDOMIZE_BASE

All the code in aslr.c gets compiled out if !CONFIG_RANDOMIZE_BASE, but
aslr.o itself still gets compiled in.  Eliminate it from the compile
entirely in that case.

This does not change the generated code at all, in either case.
Signed-off-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 9a1cb471
...@@ -28,7 +28,9 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include ...@@ -28,7 +28,9 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include
vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \ $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
$(obj)/piggy.o $(obj)/cpuflags.o $(obj)/aslr.o $(obj)/piggy.o $(obj)/cpuflags.o
vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
......
#include "misc.h" #include "misc.h"
#ifdef CONFIG_RANDOMIZE_BASE
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/archrandom.h> #include <asm/archrandom.h>
#include <asm/e820.h> #include <asm/e820.h>
...@@ -320,5 +319,3 @@ unsigned char *choose_kernel_location(unsigned char *input, ...@@ -320,5 +319,3 @@ unsigned char *choose_kernel_location(unsigned char *input,
out: out:
return (unsigned char *)choice; return (unsigned char *)choice;
} }
#endif /* CONFIG_RANDOMIZE_BASE */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment