Mercurial > illumos > s390-betelgeuse

changeset 10858:b017ac7f984a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move statements from machdep_s390 to elf_s390
author tide@localhost
date Mon, 17 Aug 2009 09:04:57 -0400
parents 08b74c8a5d91
children e2ab72b5edf3
files usr/src/cmd/sgs/include/s390/machdep_s390.h usr/src/uts/common/sys/elf_s390.h
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/sgs/include/s390/machdep_s390.h	Mon Aug 10 10:45:32 2009 -0400
+++ b/usr/src/cmd/sgs/include/s390/machdep_s390.h	Mon Aug 17 09:04:57 2009 -0400
@@ -97,6 +97,14 @@
  */
 #define	M_SEGM_ALIGN	4096
 
+# ifdef _ELF64
+#  define	M_SEGM_ORIGIN	(Addr)0x08000000ULL  /* default first segment offset */
+#  define	M_SEGM_AORIGIN	(Addr)0x4000000ULL   /* alternative default first segment offset */
+# else
+#  define	M_SEGM_ORIGIN	(Addr)0x00400000ULL /* default first segment offset */
+#  define	M_SEGM_AORIGIN	M_SEGM_ORIGIN	    /* alternative default first segment offset */
+#endif
+
 /*
  * Make common relocation information transparent to the common code
  */
--- a/usr/src/uts/common/sys/elf_s390.h	Mon Aug 10 10:45:32 2009 -0400
+++ b/usr/src/uts/common/sys/elf_s390.h	Mon Aug 17 09:04:57 2009 -0400
@@ -110,26 +110,18 @@
  */
 # define	M_PLT_ENTSIZE	32		/* plt entry size in bytes */
 # define	M_PLT_RESERVSZ	M_PLT_ENTSIZE	/* PLT[0] reserved */
-# define M_PLT_INSSIZE 	6		/* Single PLT instruction size */
+# define 	M_PLT_INSSIZE 	6		/* Single PLT instruction size */
 # define	M_PLT_XNumber	3		/* reserved no. of GOT entries */
 # define	M_PLT_ALIGN	8		/* alignment of .plt section */
 
 # ifdef _ELF64
+#  define	M_WORD_ALIGN	8
 #  define	M_GOT_ENTSIZE	8		/* got entry size in bytes */
 # else
+#  define	M_WORD_ALIGN	4
 #  define	M_GOT_ENTSIZE	4		/* got entry size in bytes */
 # endif
 
-# ifdef _ELF64
-#  define	M_WORD_ALIGN	8
-#  define	M_SEGM_ORIGIN	(Addr)0x08000000ULL  /* default first segment offset */
-#  define	M_SEGM_AORIGIN	(Addr)0x4000000ULL   /* alternative default first segment offset */
-# else
-#  define	M_WORD_ALIGN	4
-#  define	M_SEGM_ORIGIN	(Addr)0x00400000ULL /* default first segment offset */
-#  define	M_SEGM_AORIGIN	M_SEGM_ORIGIN	    /* alternative default first segment offset */
-#endif
-
 #endif	/* !_SYS_ELF_MACH_COMMON */ 
 
 #endif /* _ELF_S390_H */