Conflicts:
	include/grub/util/install.h

	Don't rely on PATH_MAX.

	an object after data. While it doesn't seem right solution, it
	works well enough and OSX isn't main compilation platform.

	While it doesn't seem right solution, it works well enough and
	OSX isn't main compilation platform.

	prevent it from pulling in dynamic linker.

	offset symbol in boot.S and use it.

	of getting addres of kernel_sector + 4 define kernel_sector_high.
	It also makes code more readable.

	of $. So introduce new preprocessor macro MACRO_DOLLAR(x) which expands
	to $$x on Apple and to $x on everything else.

	OBJCONV.

	and non-Apple. This instruction is shorter and faster,
	so no reason not to use it on both.

	.text when compiling for Apple.

	%dx restore the probe worked on non-existant drive. Reorganize the
	code a little bit to free 2 bytes necessary for push/pop.

	Add missing cast to silence warning.

	for EFI targets.

	include/grub/i386/memory_raw.h and eliminate duplicate declarations.

	clang.

	3 last commits.

	with -mcmodel=large.

	range-checking for 32-bit quantities.

	mips.

	when compiling with clang.

	Export abort () when compiling with clang.

	GRUB_MEMORY_MACHINE_SCRATCH_SIZE and increase
	GRUB_MEMORY_MACHINE_PROT_STACK_SIZE.
	The binary doesn't change (checked). It's more to better reflect actual
	usage.

	at compile time that enough of scratch size is available.

	Previously we misaligned stack by 8 in startup.S and compensated
	for it in callwrap.S. According to ABI docs (EFI and sysv amd64)
	right behaviour is to align stack in startup.S and keep it aligned
	in callwrap.S. startup.S part was committed few commits before. This
	takes care of callwrap.S.
	Reported by: Gary Lin.

	.data and .bss. May happen if compiler and assembly use different
	alignment.