Index: arch/ia32/include/elf.h
===================================================================
--- arch/ia32/include/elf.h	(revision f76fed4ce9ef078664208e11cf713b1e09aa3a72)
+++ arch/ia32/include/elf.h	(revision e1c68e0c902e5b4a5c075c1938077031ed1be8ac)
@@ -32,11 +32,12 @@
 #include <elf32.h>
 
-#define	CURRENT_ELF_MACHINE	EM_386
-#define CURRENT_ELF_DATA	ELFDATA2LSB
+#define	ELF_MACHINE		EM_386
+#define ELF_DATA_ENCODING	ELFDATA2LSB
+#define ELF_CLASS		ELFCLASS32
 
 /*
  * Main ELF loader function
  */
-#defiine elf_load(__address header, as_t *as)	elf32_load(header, as)
+#define elf_load(header, as) elf32_load(header, as)
 
 #endif