@@ -25,21 +25,21 @@
#include <stdalign.h>
+#include <asm/fcntl.h>
+#include <asm/resource.h>
+#include <linux/shm.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/un.h>
+
#include <shim_types.h>
#include <shim_defs.h>
#include <shim_sysv.h>
+#include <atomic.h> // TODO: migrate to stdatomic.h
#include <pal.h>
#include <list.h>
-#include <linux/shm.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/un.h>
-
-#include <asm/fcntl.h>
-#include <asm/resource.h>
/* start definition of shim handle */
enum shim_handle_type {
TYPE_FILE,
@@ -22,6 +22,7 @@
#define _SHIM_UTILS_H_
#include <shim_handle.h>
+#include <shim_internal.h>
@@ -41,6 +41,8 @@ Copyright (C) 2005-2014 Rich Felker, et al.
----------------------------------------------------------------------
*/
+#include <stdint.h>
/* Optimization barrier */
#define COMPILER_BARRIER() __asm__ __volatile__("": : :"memory")
#define CPU_RELAX() __asm__ __volatile__("rep; nop" ::: "memory")
@@ -1,9 +1,10 @@
-#include "pal.h"
-#include "pal_debug.h"
#include <atomic.h>
-#include <string.h>
#include <limits.h>
+#include <string.h>
+#include "pal.h"
+#include "pal_debug.h"
int main (int argc, char ** argv, char ** envp)
{
@@ -29,6 +29,7 @@
#include <sysdeps/generic/ldsodefs.h>
#include "pal_internal.h"
+#include "pal_rtld.h"
/* The x86-64 never uses Elf64_Rel relocations. */
#define ELF_MACHINE_NO_REL 1