SOURCES: binutils-gasp.patch, binutils-pt_pax_flags.patch - update...
pluto
pluto at pld-linux.org
Tue Jan 23 21:23:15 CET 2007
Author: pluto Date: Tue Jan 23 20:23:15 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.17.50.0.10.
---- Files affected:
SOURCES:
binutils-gasp.patch (1.13 -> 1.14) , binutils-pt_pax_flags.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/binutils-gasp.patch
diff -u SOURCES/binutils-gasp.patch:1.13 SOURCES/binutils-gasp.patch:1.14
--- SOURCES/binutils-gasp.patch:1.13 Thu Jan 4 14:18:05 2007
+++ SOURCES/binutils-gasp.patch Tue Jan 23 21:23:10 2007
@@ -5516,7 +5516,7 @@
diff -urNbB binutils-2.16.91.0.2.org/gas/macro.c binutils-2.16.91.0.2/gas/macro.c
--- binutils-2.16.91.0.2.org/gas/macro.c 2005-05-10 22:46:44.000000000 +0000
+++ binutils-2.16.91.0.2/gas/macro.c 2005-07-21 18:31:04.000000000 +0000
-@@ -77,8 +77,8 @@
+@@ -41,8 +41,8 @@
static int get_apost_token (int, sb *, sb *, int);
static int sub_actual (int, sb *, sb *, struct hash_control *, int, sb *, int);
static const char *macro_expand_body
@@ -5527,7 +5527,7 @@
static void free_macro(macro_entry *);
#define ISWHITE(x) ((x) == ' ' || (x) == '\t')
-@@ -762,7 +762,7 @@
+@@ -754,7 +754,7 @@
static const char *
macro_expand_body (sb *in, sb *out, formal_entry *formals,
@@ -5536,7 +5536,7 @@
{
sb t;
int src = 0, inquote = 0, macro_line = 0;
-@@ -794,7 +794,14 @@
+@@ -786,7 +786,14 @@
else if (in->ptr[src] == '\\')
{
src++;
@@ -5552,7 +5552,7 @@
{
/* Sub in till the next ')' literally. */
src++;
-@@ -875,7 +882,7 @@
+@@ -867,7 +874,7 @@
else
{
src = sb_skip_white (src + 5, in);
@@ -5561,7 +5561,7 @@
{
const char *name;
formal_entry *f = new_formal ();
-@@ -911,6 +918,17 @@
+@@ -903,6 +910,17 @@
}
}
}
@@ -5579,7 +5579,7 @@
else if (in->ptr[src] == '"'
|| (macro_mri && in->ptr[src] == '\''))
{
-@@ -992,7 +1010,7 @@
+@@ -984,7 +1002,7 @@
body. */
static const char *
@@ -5588,7 +5588,7 @@
{
sb t;
formal_entry *ptr;
-@@ -1038,7 +1056,7 @@
+@@ -1029,7 +1047,7 @@
/* Peel off the actuals and store them away in the hash tables' actuals. */
idx = sb_skip_white (idx, in);
@@ -5597,7 +5597,7 @@
{
int scan;
-@@ -1167,7 +1185,7 @@
+@@ -1156,7 +1174,7 @@
sb_add_string (&ptr->actual, buffer);
}
@@ -5606,7 +5606,7 @@
}
/* Discard any unnamed formal arguments. */
-@@ -1200,7 +1218,7 @@
+@@ -1189,7 +1207,7 @@
*EXPAND. Return 1 if a macro is found, 0 otherwise. */
int
@@ -5615,7 +5615,7 @@
const char **error, macro_entry **info)
{
const char *s;
-@@ -1235,7 +1253,7 @@
+@@ -1224,7 +1242,7 @@
sb_add_char (&line_sb, *s++);
sb_new (expand);
@@ -5624,7 +5624,7 @@
sb_kill (&line_sb);
-@@ -1296,7 +1314,7 @@
+@@ -1285,7 +1303,7 @@
success, or an error message otherwise. */
const char *
@@ -5633,7 +5633,7 @@
{
sb sub;
formal_entry f;
-@@ -1329,16 +1347,16 @@
+@@ -1318,10 +1336,10 @@
sb_reset (out);
idx = sb_skip_comma (idx, in);
@@ -5646,26 +5646,28 @@
}
else
{
- if (irpc && in->ptr[idx] == '"')
- ++idx;
+@@ -1333,7 +1351,7 @@
+ ++idx;
+ }
+
- while (idx < in->len)
+ while (idx < in->len && in->ptr[idx] != comment_char)
{
if (!irpc)
idx = get_any_string (idx, in, &f.actual);
-@@ -1349,7 +1367,7 @@
- int nxt;
-
+@@ -1347,7 +1365,7 @@
+ in_quotes = ! in_quotes;
+
nxt = sb_skip_white (idx + 1, in);
- if (nxt >= in->len)
+ if (nxt >= in->len || in->ptr[nxt] == comment_char)
{
idx = nxt;
break;
-@@ -1359,7 +1377,7 @@
- sb_add_char (&f.actual, in->ptr[idx]);
+@@ -1358,7 +1376,7 @@
++idx;
}
+
- err = macro_expand_body (&sub, out, &f, h, 0);
+ err = macro_expand_body (&sub, out, &f, h, 0, comment_char);
if (err != NULL)
================================================================
Index: SOURCES/binutils-pt_pax_flags.patch
diff -u SOURCES/binutils-pt_pax_flags.patch:1.8 SOURCES/binutils-pt_pax_flags.patch:1.9
--- SOURCES/binutils-pt_pax_flags.patch:1.8 Mon Sep 25 09:35:17 2006
+++ SOURCES/binutils-pt_pax_flags.patch Tue Jan 23 21:23:10 2007
@@ -85,7 +85,7 @@
diff -uNr binutils-2.15.94.0.2.2.orig/bfd/elflink.c binutils-2.15.94.0.2.2/bfd/elflink.c
--- binutils-2.15.94.0.2.2.orig/bfd/elflink.c 2005-02-07 20:42:44.000000000 +0100
+++ binutils-2.15.94.0.2.2/bfd/elflink.c 2005-02-20 13:13:17.432547560 +0100
-@@ -4757,17 +4757,31 @@
+@@ -5286,16 +5286,30 @@
if (!is_elf_hash_table (info->hash))
return TRUE;
@@ -96,7 +96,6 @@
+ else if (info->noexecheap)
+ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
+
- elf_tdata (output_bfd)->relro = info->relro;
if (info->execstack)
- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+ {
@@ -119,7 +118,7 @@
for (inputobj = info->input_bfds;
inputobj;
inputobj = inputobj->link_next)
-@@ -4780,7 +4794,11 @@
+@@ -5308,7 +5322,11 @@
if (s)
{
if (s->flags & SEC_CODE)
@@ -164,10 +163,10 @@
diff -uNr binutils-2.15.94.0.2.2.orig/include/elf/common.h binutils-2.15.94.0.2.2/include/elf/common.h
--- binutils-2.15.94.0.2.2.orig/include/elf/common.h 2004-11-22 21:33:32.000000000 +0100
+++ binutils-2.15.94.0.2.2/include/elf/common.h 2005-02-20 13:13:17.482539960 +0100
-@@ -293,12 +293,27 @@
- #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */
+@@ -307,12 +307,27 @@
#define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */
#define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */
+ #define PT_GNU_SHR (PT_LOOS + 0x474e554) /* Sharable segment */
+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */
/* Program segment permissions, in program header p_flags field. */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/binutils-gasp.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SOURCES/binutils-pt_pax_flags.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list