Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02c50256 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/build changes from Ingo Molnar.

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, build: Fix portability issues when cross-building
  x86, tools: Remove unneeded header files from tools/build.c
  USB: ffs-test: Don't duplicate {get,put}_unaligned*() functions
  x86, efi: Fix endian issues and unaligned accesses
  x86, boot: Restrict CFLAGS for hostprogs
  x86, mkpiggy: Don't open code put_unaligned_le32()
  x86, relocs: Don't open code put_unaligned_le32()
  tools/include: Add byteshift headers for endian access
parents f06fc0c0 a51f4047

arch/x86/boot/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ setup-y += video-bios.o 
targets		+= $(setup-y)

hostprogs-y	:= mkcpustr tools/build



HOST_EXTRACFLAGS += $(LINUXINCLUDE)



HOSTCFLAGS_mkcpustr.o := -I$(srctree)/arch/$(SRCARCH)/include

HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/tools/include \

                   -include $(srctree)/include/linux/kconfig.h

$(obj)/cpu.o: $(obj)/cpustr.h



quiet_cmd_cpustr = CPUSTR  $@

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LDFLAGS := -m elf_$(UTS_MACHINE) 
LDFLAGS_vmlinux := -T



hostprogs-y	:= mkpiggy

HOST_EXTRACFLAGS += -I$(srctree)/tools/include



VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \

	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \

arch/x86/boot/compressed/mkpiggy.c

+2 −9
Original line number Diff line number Diff line
@@ -29,14 +29,7 @@ 
#include <stdio.h>

#include <string.h>

#include <inttypes.h>



static uint32_t getle32(const void *p)

{

	const uint8_t *cp = p;



	return (uint32_t)cp[0] + ((uint32_t)cp[1] << 8) +

		((uint32_t)cp[2] << 16) + ((uint32_t)cp[3] << 24);

}

#include <tools/le_byteshift.h>



int main(int argc, char *argv[])

{
@@ -69,7 +62,7 @@ int main(int argc, char *argv[]) 
	}



	ilen = ftell(f);

	olen = getle32(&olen);

	olen = get_unaligned_le32(&olen);

	fclose(f);



	/*

arch/x86/boot/compressed/relocs.c

+2 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define USE_BSD

#include <endian.h>

#include <regex.h>

#include <tools/le_byteshift.h>



static void die(char *fmt, ...);
@@ -605,10 +606,7 @@ static void emit_relocs(int as_text) 
		fwrite("\0\0\0\0", 4, 1, stdout);

		/* Now print each relocation */

		for (i = 0; i < reloc_count; i++) {

			buf[0] = (relocs[i] >>  0) & 0xff;

			buf[1] = (relocs[i] >>  8) & 0xff;

			buf[2] = (relocs[i] >> 16) & 0xff;

			buf[3] = (relocs[i] >> 24) & 0xff;

			put_unaligned_le32(relocs[i], buf);

			fwrite(buf, 4, 1, stdout);

		}

	}

arch/x86/boot/tools/build.c

+19 −21
Original line number Diff line number Diff line
@@ -29,18 +29,18 @@ 
#include <stdarg.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/sysmacros.h>

#include <unistd.h>

#include <fcntl.h>

#include <sys/mman.h>

#include <asm/boot.h>

#include <tools/le_byteshift.h>



typedef unsigned char  u8;

typedef unsigned short u16;

typedef unsigned long  u32;

typedef unsigned int   u32;



#define DEFAULT_MAJOR_ROOT 0

#define DEFAULT_MINOR_ROOT 0

#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)



/* Minimal number of setup sectors */

#define SETUP_SECT_MIN 5
@@ -159,7 +159,7 @@ int main(int argc, char ** argv) 
		die("read-error on `setup'");

	if (c < 1024)

		die("The setup must be at least 1024 bytes");

	if (buf[510] != 0x55 || buf[511] != 0xaa)

	if (get_unaligned_le16(&buf[510]) != 0xAA55)

		die("Boot block hasn't got boot flag (0xAA55)");

	fclose(file);
@@ -171,8 +171,7 @@ int main(int argc, char ** argv) 
	memset(buf+c, 0, i-c);



	/* Set the default root device */

	buf[508] = DEFAULT_MINOR_ROOT;

	buf[509] = DEFAULT_MAJOR_ROOT;

	put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);



	fprintf(stderr, "Setup is %d bytes (padded to %d bytes).\n", c, i);
@@ -192,44 +191,42 @@ int main(int argc, char ** argv) 


	/* Patch the setup code with the appropriate size parameters */

	buf[0x1f1] = setup_sectors-1;

	buf[0x1f4] = sys_size;

	buf[0x1f5] = sys_size >> 8;

	buf[0x1f6] = sys_size >> 16;

	buf[0x1f7] = sys_size >> 24;

	put_unaligned_le32(sys_size, &buf[0x1f4]);



#ifdef CONFIG_EFI_STUB

	file_sz = sz + i + ((sys_size * 16) - sz);



	pe_header = *(unsigned int *)&buf[0x3c];

	pe_header = get_unaligned_le32(&buf[0x3c]);



	/* Size of code */

	*(unsigned int *)&buf[pe_header + 0x1c] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0x1c]);



	/* Size of image */

	*(unsigned int *)&buf[pe_header + 0x50] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0x50]);



#ifdef CONFIG_X86_32

	/* Address of entry point */

	*(unsigned int *)&buf[pe_header + 0x28] = i;

	put_unaligned_le32(i, &buf[pe_header + 0x28]);



	/* .text size */

	*(unsigned int *)&buf[pe_header + 0xb0] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0xb0]);



	/* .text size of initialised data */

	*(unsigned int *)&buf[pe_header + 0xb8] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0xb8]);

#else

	/*

	 * Address of entry point. startup_32 is at the beginning and

	 * the 64-bit entry point (startup_64) is always 512 bytes

	 * after.

	 */

	*(unsigned int *)&buf[pe_header + 0x28] = i + 512;

	put_unaligned_le32(i + 512, &buf[pe_header + 0x28]);



	/* .text size */

	*(unsigned int *)&buf[pe_header + 0xc0] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0xc0]);



	/* .text size of initialised data */

	*(unsigned int *)&buf[pe_header + 0xc8] = file_sz;

	put_unaligned_le32(file_sz, &buf[pe_header + 0xc8]);



#endif /* CONFIG_X86_32 */

#endif /* CONFIG_EFI_STUB */
@@ -250,8 +247,9 @@ int main(int argc, char ** argv) 
	}



	/* Write the CRC */

	fprintf(stderr, "CRC %lx\n", crc);

	if (fwrite(&crc, 1, 4, stdout) != 4)

	fprintf(stderr, "CRC %x\n", crc);

	put_unaligned_le32(crc, buf);

	if (fwrite(buf, 1, 4, stdout) != 4)

		die("Writing CRC failed");



	close(fd);