Author: kib
Date: Tue Dec 22 19:51:49 2009
New Revision: 200858
URL: http://svn.freebsd.org/changeset/base/200858

Log:
  MFC r186212 (by imp):
  AT_DEBUG and AT_BRK were OBE like 10 years ago, so retire them.
  
  MFC r186225:
  Remove two remnant uses of AT_DEBUG.

Modified:
  stable/7/sys/amd64/include/elf.h
  stable/7/sys/arm/include/elf.h
  stable/7/sys/compat/svr4/svr4_sysvec.c
  stable/7/sys/i386/include/elf.h
  stable/7/sys/ia64/include/elf.h
  stable/7/sys/kern/imgact_elf.c
  stable/7/sys/powerpc/include/elf.h
  stable/7/sys/sparc64/include/elf.h
  stable/7/sys/sun4v/include/elf.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/elf.h
==============================================================================
--- stable/7/sys/amd64/include/elf.h    Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/amd64/include/elf.h    Tue Dec 22 19:51:49 2009        
(r200858)
@@ -81,18 +81,6 @@ __ElfType(Auxinfo);
 #define        AT_BASE         7       /* Interpreter's base address. */
 #define        AT_FLAGS        8       /* Flags (unused for i386). */
 #define        AT_ENTRY        9       /* Where interpreter should transfer 
control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define        AT_BRK          10      /* Starting point for sbrk and brk. */
-#define        AT_DEBUG        11      /* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */

Modified: stable/7/sys/arm/include/elf.h
==============================================================================
--- stable/7/sys/arm/include/elf.h      Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/arm/include/elf.h      Tue Dec 22 19:51:49 2009        
(r200858)
@@ -70,10 +70,6 @@ __ElfType(Auxinfo);
 #define AT_BASE         7       /* Interpreter's base address. */
 #define AT_FLAGS        8       /* Flags (unused). */
 #define AT_ENTRY        9       /* Where interpreter should transfer control. 
*/
-
-#define AT_BRK          10      /* Starting point for sbrk and brk. */
-#define AT_DEBUG        11      /* Debugging level. */
-
 #define AT_NOTELF       10      /* Program is not ELF ?? */
 #define AT_UID          11      /* Real uid. */
 #define AT_EUID         12      /* Effective uid. */

Modified: stable/7/sys/compat/svr4/svr4_sysvec.c
==============================================================================
--- stable/7/sys/compat/svr4/svr4_sysvec.c      Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/compat/svr4/svr4_sysvec.c      Tue Dec 22 19:51:49 2009        
(r200858)
@@ -222,8 +222,6 @@ svr4_fixup(register_t **stack_base, stru
        args = (Elf32_Auxargs *)imgp->auxargs;
        pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);  
     
-       if (args->trace)
-               AUXARGS_ENTRY(pos, AT_DEBUG, 1);
        if (args->execfd != -1)
                AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd);
        AUXARGS_ENTRY(pos, AT_PHDR, args->phdr);

Modified: stable/7/sys/i386/include/elf.h
==============================================================================
--- stable/7/sys/i386/include/elf.h     Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/i386/include/elf.h     Tue Dec 22 19:51:49 2009        
(r200858)
@@ -84,18 +84,6 @@ __ElfType(Auxinfo);
 #define        AT_BASE         7       /* Interpreter's base address. */
 #define        AT_FLAGS        8       /* Flags (unused for i386). */
 #define        AT_ENTRY        9       /* Where interpreter should transfer 
control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define        AT_BRK          10      /* Starting point for sbrk and brk. */
-#define        AT_DEBUG        11      /* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */

Modified: stable/7/sys/ia64/include/elf.h
==============================================================================
--- stable/7/sys/ia64/include/elf.h     Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/ia64/include/elf.h     Tue Dec 22 19:51:49 2009        
(r200858)
@@ -82,18 +82,6 @@ __ElfType(Auxinfo);
 #define        AT_BASE         7       /* Interpreter's base address. */
 #define        AT_FLAGS        8       /* Flags (unused for i386). */
 #define        AT_ENTRY        9       /* Where interpreter should transfer 
control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define        AT_BRK          10      /* Starting point for sbrk and brk. */
-#define        AT_DEBUG        11      /* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */

Modified: stable/7/sys/kern/imgact_elf.c
==============================================================================
--- stable/7/sys/kern/imgact_elf.c      Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/kern/imgact_elf.c      Tue Dec 22 19:51:49 2009        
(r200858)
@@ -943,9 +943,6 @@ __elfN(freebsd_fixup)(register_t **stack
        base = (Elf_Addr *)*stack_base;
        pos = base + (imgp->args->argc + imgp->args->envc + 2);
 
-       if (args->trace) {
-               AUXARGS_ENTRY(pos, AT_DEBUG, 1);
-       }
        if (args->execfd != -1) {
                AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd);
        }

Modified: stable/7/sys/powerpc/include/elf.h
==============================================================================
--- stable/7/sys/powerpc/include/elf.h  Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/powerpc/include/elf.h  Tue Dec 22 19:51:49 2009        
(r200858)
@@ -80,9 +80,6 @@ __ElfType(Auxinfo);
 
 #define        AT_COUNT        13      /* Count of defined aux entry types. */
 
-/* Used in John Polstra's testbed stuff. */
-#define        AT_DEBUG        14      /* Debugging level. */
-
 /*
  * Relocation types.
  */

Modified: stable/7/sys/sparc64/include/elf.h
==============================================================================
--- stable/7/sys/sparc64/include/elf.h  Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/sparc64/include/elf.h  Tue Dec 22 19:51:49 2009        
(r200858)
@@ -78,18 +78,6 @@ __ElfType(Auxinfo);
 #define        AT_BASE         7       /* Interpreter's base address. */
 #define        AT_FLAGS        8       /* Flags (unused). */
 #define        AT_ENTRY        9       /* Where interpreter should transfer 
control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define        T_BRK           10      /* Starting point for sbrk and brk. */
-#define        AT_DEBUG        11      /* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */

Modified: stable/7/sys/sun4v/include/elf.h
==============================================================================
--- stable/7/sys/sun4v/include/elf.h    Tue Dec 22 19:48:06 2009        
(r200857)
+++ stable/7/sys/sun4v/include/elf.h    Tue Dec 22 19:51:49 2009        
(r200858)
@@ -78,18 +78,6 @@ __ElfType(Auxinfo);
 #define        AT_BASE         7       /* Interpreter's base address. */
 #define        AT_FLAGS        8       /* Flags (unused). */
 #define        AT_ENTRY        9       /* Where interpreter should transfer 
control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define        T_BRK           10      /* Starting point for sbrk and brk. */
-#define        AT_DEBUG        11      /* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to