Index: kernel/mod_raw.cc
===================================================================
--- kernel/mod_raw.cc	(revision 13668)
+++ kernel/mod_raw.cc	(working copy)
@@ -154,59 +154,8 @@
  * SECTION generic ELF: ix86-linux / alpha-linux / IA64-linux /x86_64_Linux  *
  *                      SunOS-5 / IRIX-6 / ppcMac-Darwin / FreeeBSD          *
  *****************************************************************************/
-#if defined(ix86_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
 
-#if defined(ix86_Linux_libc5)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(DecAlpha_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(IA64_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(x86_64_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(ppc_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(hppa_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(SunOS_5)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#ifdef IRIX_6
-#define HAVE_ELF_SYSTEM
-#endif
-
-#ifdef ppcMac_darwin
-#define HAVE_ELF_SYSTEM
-#endif
-
-#ifdef ix86Mac_darwin
-#define HAVE_ELF_SYSTEM
-#endif
-
-#ifdef ix86_freebsd
-#define HAVE_ELF_SYSTEM
-#endif
-
-#ifdef sparc64_Linux
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(HAVE_ELF_SYSTEM)
+#if defined(__ELF__)
 #include <dlfcn.h>
 
 static void* kernel_handle = NULL;
Index: dyn_modules/modgen/makefile.cc
===================================================================
--- dyn_modules/modgen/makefile.cc	(revision 13668)
+++ dyn_modules/modgen/makefile.cc	(working copy)
@@ -154,43 +154,8 @@
 /*========================================================================*/
 /*===  Machine depend Makefile creation                                ===*/
 /*========================================================================*/
-#if defined(ix86_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
 
-#if defined(ix86_Linux_libc5)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(ix86_freebsd)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(x86_64_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(IRIX_6)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(sparc64_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(IA64_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(DecAlpha_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(ppc_Linux)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(HAVE_ELF_SYSTEM)
+#if defined(__ELF__)
 void build_compile_section(
   FILE *fp,
   moddefv module