Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/binutils/patches/elf-common.h.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Mon, 31 Oct 2016 18:10:23 -0700
changeset 7216 e6bcf0c5a213
parent 5057 ab1b43bf588f
permissions -rw-r--r--
23245353 Move seahorse to Userland and update to 3.18.0 PSARC/2016/311 GNOME Security Libraries
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5057
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# If building on Solaris, then do the following:
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# 1. #include <sys/auxv.h> - which will bring in all the
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# necessary AT_SUN_* macros.
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
# 2. #ifndef guard all the AT_SUN_* macros. The definitions from
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
# /usr/include/sys/auxv.h will be used.
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
#
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
# If not building on Solaris - i.e. cross-compiling, then
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
# the AT_SUN_* macro definitions present here will be used.
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
#
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
# This patch has been submitted to the community.
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
--- include/elf/common.h	2014-10-14 00:32:04.000000000 -0700
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+++ include/elf/common.h	2015-08-04 12:32:32.098574442 -0700
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
@@ -30,6 +30,10 @@
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 #ifndef _ELF_COMMON_H
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 #define _ELF_COMMON_H
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+#if defined(sun) || defined(__sun) || defined(__sun__)
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
+#include <sys/auxv.h>
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
 /* Fields in e_ident[].  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
 #define EI_MAG0		0	/* File identification byte 0 index */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
@@ -975,25 +979,77 @@
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
 #define AT_L2_CACHESHAPE  36
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
 #define AT_L3_CACHESHAPE  37
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+#ifndef AT_SUN_UID
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 #define AT_SUN_UID      2000    /* Effective user ID.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+#ifndef AT_SUN_RUID
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
 #define AT_SUN_RUID     2001    /* Real user ID.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
+#ifndef AT_SUN_GID
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
 #define AT_SUN_GID      2002    /* Effective group ID.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
+#ifndef AT_SUN_RGID
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
 #define AT_SUN_RGID     2003    /* Real group ID.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
+#ifndef AT_SUN_LDELF
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    45
 
 #define AT_SUN_LDELF    2004    /* Dynamic linker's ELF header.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    47
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    48
 
+#ifndef AT_SUN_LDSHDR
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    49
 
 #define AT_SUN_LDSHDR   2005    /* Dynamic linker's section headers.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    50
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    51
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    52
 
+#ifndef AT_SUN_LDNAME
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    53
 
 #define AT_SUN_LDNAME   2006    /* String giving name of dynamic linker.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    54
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    55
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    56
 
+#ifndef AT_SUN_LPAGESZ
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    57
 
 #define AT_SUN_LPAGESZ  2007    /* Large pagesize.   */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    58
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    59
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    60
 
+#ifndef AT_SUN_PLATFORM
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    61
 
 #define AT_SUN_PLATFORM 2008    /* Platform name string.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    62
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    63
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    64
 
+#ifndef AT_SUN_HWCAP
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    65
 
 #define AT_SUN_HWCAP    2009	/* Machine dependent hints about
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    66
 
 				   processor capabilities.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    67
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    68
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    69
 
+#ifndef AT_SUN_IFLUSH
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    70
 
 #define AT_SUN_IFLUSH   2010    /* Should flush icache? */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    71
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    72
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    73
 
+#ifndef AT_SUN_CPU
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    74
 
 #define AT_SUN_CPU      2011    /* CPU name string.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    75
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    76
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    77
 
+#ifndef AT_SUN_EMUL_ENTRY
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    78
 
 #define AT_SUN_EMUL_ENTRY 2012	/* COFF entry point address.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    79
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    80
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    81
 
+#ifndef AT_SUN_EMUL_EXECFD
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    82
 
 #define AT_SUN_EMUL_EXECFD 2013	/* COFF executable file descriptor.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    83
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    84
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    85
 
+#ifndef AT_SUN_EXECNAME
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    86
 
 #define AT_SUN_EXECNAME 2014    /* Canonicalized file name given to execve.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    87
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    88
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    89
 
+#ifndef AT_SUN_MMU
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    90
 
 #define AT_SUN_MMU      2015    /* String for name of MMU module.   */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    91
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    92
 
+
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    93
 
+#ifndef AT_SUN_LDDATA
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    94
 
 #define AT_SUN_LDDATA   2016    /* Dynamic linker's data segment address.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    95
 
-#define AT_SUN_AUXFLAGS	2017	/* AF_SUN_ flags passed from the kernel.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    96
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    97
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    98
 
+#ifndef AT_SUN_AUXFLAGS
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    99
 
+#define AT_SUN_AUXFLAGS	2017	/* AF_SUN_ flags passed from the kernel.  */
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
   100
 
+#endif
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
   101
ab1b43bf588f 21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
   102
 
 #endif /* _ELF_COMMON_H */
upstream/oracle/userland-gate