PERFORCE change 95198 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=95198

Change 95198 by jb at jb_freebsd2 on 2006/04/14 00:31:19

	Stop using Sun's ELF and link headers and use ours instead. Include
	a couple of compatibility headers for Sun's extensions.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#3 (text) ====

@@ -33,18 +33,26 @@
 extern "C" {
 #endif
 
+#if	defined(sun)
 #if defined(__amd64)
 #include <sys/elf_amd64.h>
 #elif defined(__i386)
 #include <sys/elf_386.h>
 #endif
+#endif
+
 #ifndef	_ASM
 #include <sys/types.h>
-#if	!defined(sun)
+#if	defined(sun)
+#include <sys/elf.h>
+#include <sys/link.h>	/* for Elf*_Dyn */
+#else
+#include <elf.h>
+#include <link.h>
 #include <opensolaris/compat/sys/types.h>
+#include <opensolaris/compat/sys/elf.h>
+#include <opensolaris/compat/sys/link.h>
 #endif
-#include <sys/elf.h>
-#include <sys/link.h>	/* for Elf*_Dyn */
 #endif	/* _ASM */
 
 /*