svn commit: r326590 - in head/stand: common efi/loader

[Warner Losh]

Author: imp
Date: Tue Dec  5 21:38:04 2017
New Revision: 326590
URL: https://svnweb.freebsd.org/changeset/base/326590

Log:
  Prefer stdint.h to inttypes.h since the added prototypes form the
  latter aren't used. Prefer sys/link_elf.h to link.h so we're only
  dependent on the kernel tree. The default installation of link.h just
  includes this file, and any benefit from that is outweighed by the
  hassle it causes. This reduces the footprint of files needed from the
  system includes (or sysroot in buildworld).
  
  Sponsored by: Netflix

Modified:
  head/stand/common/load_elf.c
  head/stand/common/load_elf_obj.c
  head/stand/common/reloc_elf.c
  head/stand/efi/loader/main.c

Modified: head/stand/common/load_elf.c
==============================================================================
--- head/stand/common/load_elf.c	Tue Dec  5 21:37:59 2017	(r326589)
+++ head/stand/common/load_elf.c	Tue Dec  5 21:38:04 2017	(r326590)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/elf.h>
 #include <stand.h>
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 

Modified: head/stand/common/load_elf_obj.c
==============================================================================
--- head/stand/common/load_elf_obj.c	Tue Dec  5 21:37:59 2017	(r326589)
+++ head/stand/common/load_elf_obj.c	Tue Dec  5 21:38:04 2017	(r326590)
@@ -33,12 +33,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/exec.h>
 #include <sys/linker.h>
 #include <sys/module.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <string.h>
 #include <machine/elf.h>
 #include <stand.h>
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 

Modified: head/stand/common/reloc_elf.c
==============================================================================
--- head/stand/common/reloc_elf.c	Tue Dec  5 21:37:59 2017	(r326589)
+++ head/stand/common/reloc_elf.c	Tue Dec  5 21:38:04 2017	(r326590)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stand.h>
 
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 

Modified: head/stand/efi/loader/main.c
==============================================================================
--- head/stand/efi/loader/main.c	Tue Dec  5 21:37:59 2017	(r326589)
+++ head/stand/efi/loader/main.c	Tue Dec  5 21:38:04 2017	(r326590)
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/boot.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <stand.h>
 #include <string.h>
 #include <setjmp.h>