svn commit: r305848 - in stable/11/sys: arm/include sys

[Ed Maste]

Author: emaste
Date: Thu Sep 15 17:37:30 2016
New Revision: 305848
URL: https://svnweb.freebsd.org/changeset/base/305848

Log:
  MFC r303677: Move/add ARM ELF PHDR types to elf_common.h

Modified:
  stable/11/sys/arm/include/elf.h
  stable/11/sys/sys/elf_common.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/include/elf.h
==============================================================================
--- stable/11/sys/arm/include/elf.h	Thu Sep 15 17:36:43 2016	(r305847)
+++ stable/11/sys/arm/include/elf.h	Thu Sep 15 17:37:30 2016	(r305848)
@@ -55,9 +55,6 @@ __ElfType(Auxinfo);
 
 #define	ELF_MACHINE_OK(x) ((x) == EM_ARM)
 
-/* Unwind info section type */
-#define	PT_ARM_EXIDX (PT_LOPROC + 1)
-
 /*
  * Relocation types.
  */

Modified: stable/11/sys/sys/elf_common.h
==============================================================================
--- stable/11/sys/sys/elf_common.h	Thu Sep 15 17:36:43 2016	(r305847)
+++ stable/11/sys/sys/elf_common.h	Thu Sep 15 17:37:30 2016	(r305848)
@@ -511,6 +511,8 @@ typedef struct {
 #define	PT_HISUNW	0x6fffffff
 #define	PT_HIOS		0x6fffffff	/* Last OS-specific. */
 #define	PT_LOPROC	0x70000000	/* First processor-specific type. */
+#define	PT_ARM_ARCHEXT	0x70000000	/* ARM arch compat information. */
+#define	PT_ARM_EXIDX	0x70000001	/* ARM exception unwind tables. */
 #define	PT_HIPROC	0x7fffffff	/* Last processor-specific type. */
 
 /* Values for p_flags. */