Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/binutils/2.19.50.0.1: 63_all_binutils-2.18-pt-pax-flags-20070828.patch
Date: Fri, 28 Nov 2008 05:01:53
Message-Id: E1L5vUE-0007qK-RZ@stork.gentoo.org
1 vapier 08/11/28 05:01:50
2
3 Modified: 63_all_binutils-2.18-pt-pax-flags-20070828.patch
4 Log:
5 tweak style a bit to match upstream
6
7 Revision Changes Path
8 1.2 src/patchsets/binutils/2.19.50.0.1/63_all_binutils-2.18-pt-pax-flags-20070828.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/binutils/2.19.50.0.1/63_all_binutils-2.18-pt-pax-flags-20070828.patch?rev=1.2&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/binutils/2.19.50.0.1/63_all_binutils-2.18-pt-pax-flags-20070828.patch?rev=1.2&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/binutils/2.19.50.0.1/63_all_binutils-2.18-pt-pax-flags-20070828.patch?r1=1.1&r2=1.2
13
14 Index: 63_all_binutils-2.18-pt-pax-flags-20070828.patch
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/src/patchsets/binutils/2.19.50.0.1/63_all_binutils-2.18-pt-pax-flags-20070828.patch,v
17 retrieving revision 1.1
18 retrieving revision 1.2
19 diff -u -r1.1 -r1.2
20 --- 63_all_binutils-2.18-pt-pax-flags-20070828.patch 26 Oct 2008 10:01:09 -0000 1.1
21 +++ 63_all_binutils-2.18-pt-pax-flags-20070828.patch 28 Nov 2008 05:01:50 -0000 1.2
22 @@ -69,7 +69,7 @@
23 8. PT_DYNAMIC should not contain empty sections at the beginning
24 - (with the possible exception of .dynamic). */
25 + (with the possible exception of .dynamic).
26 -+ 9. PT_PAX_FLAGS segments does not include any sections. */
27 ++ 9. PT_PAX_FLAGS segments do not include any sections. */
28 #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \
29 ((((segment->p_paddr \
30 ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \
31 @@ -87,8 +87,8 @@
32 return TRUE;
33
34 bed = get_elf_backend_data (output_bfd);
35 -+ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
36 +
37 ++ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
38 + if (info->execheap)
39 + elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
40 + else if (info->noexecheap)
41 @@ -212,7 +212,7 @@
42 fprintf (file, _("\
43 -z execstack Mark executable as requiring executable stack\n"));
44 + fprintf (file, _("\
45 -+ -z execheap\t\tMark executable as requiring executable heap\n"));
46 ++ -z execheap Mark executable as requiring executable heap\n"));
47 fprintf (file, _("\
48 -z initfirst Mark DSO to be initialized first at runtime\n"));
49 fprintf (file, _("\
50 @@ -221,7 +221,7 @@
51 fprintf (file, _("\
52 -z noexecstack Mark executable as not requiring executable stack\n"));
53 + fprintf (file, _("\
54 -+ -z noexecheap\tMark executable as not requiring executable heap\n"));
55 ++ -z noexecheap Mark executable as not requiring executable heap\n"));
56 EOF
57
58 if test -n "$COMMONPAGESIZE"; then