Sat Jan 9 02:05:01 2016 UTC ()
add -fdebug-regex-map=regex=subst which works like sed -e s/regex/subst/
to aid with /usr/obj remapping for MKREPRO


(christos)
diff -r1.11 -r1.12 src/external/gpl3/gcc/dist/gcc/Makefile.in
diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/common.opt
diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/opts.c
diff -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/debug.h
diff -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/final.c
diff -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/opts-global.c
diff -r0 -r1.1 src/external/gpl3/gcc/dist/gcc/regsub.c
diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/ppc-asm.h
diff -r1.24 -r1.25 src/external/gpl3/gcc/usr.bin/backend/Makefile

cvs diff -r1.11 -r1.12 src/external/gpl3/gcc/dist/gcc/Makefile.in (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/Makefile.in 2015/11/02 00:51:18 1.11
+++ src/external/gpl3/gcc/dist/gcc/Makefile.in 2016/01/09 02:05:00 1.12
@@ -1326,26 +1326,27 @@ OBJS = \ @@ -1326,26 +1326,27 @@ OBJS = \
1326 predict.o \ 1326 predict.o \
1327 print-rtl.o \ 1327 print-rtl.o \
1328 print-tree.o \ 1328 print-tree.o \
1329 profile.o \ 1329 profile.o \
1330 real.o \ 1330 real.o \
1331 realmpfr.o \ 1331 realmpfr.o \
1332 recog.o \ 1332 recog.o \
1333 reg-stack.o \ 1333 reg-stack.o \
1334 regcprop.o \ 1334 regcprop.o \
1335 reginfo.o \ 1335 reginfo.o \
1336 regmove.o \ 1336 regmove.o \
1337 regrename.o \ 1337 regrename.o \
1338 regstat.o \ 1338 regstat.o \
 1339 regsub.o \
1339 reload.o \ 1340 reload.o \
1340 reload1.o \ 1341 reload1.o \
1341 reorg.o \ 1342 reorg.o \
1342 resource.o \ 1343 resource.o \
1343 rtl-error.o \ 1344 rtl-error.o \
1344 rtl.o \ 1345 rtl.o \
1345 rtlanal.o \ 1346 rtlanal.o \
1346 rtlhooks.o \ 1347 rtlhooks.o \
1347 sbitmap.o \ 1348 sbitmap.o \
1348 sched-deps.o \ 1349 sched-deps.o \
1349 sched-ebb.o \ 1350 sched-ebb.o \
1350 sched-rgn.o \ 1351 sched-rgn.o \
1351 sched-vis.o \ 1352 sched-vis.o \

cvs diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/common.opt (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/common.opt 2014/10/12 06:58:17 1.1.1.3
+++ src/external/gpl3/gcc/dist/gcc/common.opt 2016/01/09 02:05:00 1.2
@@ -964,27 +964,31 @@ fdata-sections @@ -964,27 +964,31 @@ fdata-sections
964Common Report Var(flag_data_sections) Optimization 964Common Report Var(flag_data_sections) Optimization
965Place data items into their own section 965Place data items into their own section
966 966
967fdbg-cnt-list 967fdbg-cnt-list
968Common Report Var(common_deferred_options) Defer 968Common Report Var(common_deferred_options) Defer
969List all available debugging counters with their limits and counts. 969List all available debugging counters with their limits and counts.
970 970
971fdbg-cnt= 971fdbg-cnt=
972Common RejectNegative Joined Var(common_deferred_options) Defer 972Common RejectNegative Joined Var(common_deferred_options) Defer
973-fdbg-cnt=<counter>:<limit>[,<counter>:<limit>,...] Set the debug counter limit.  973-fdbg-cnt=<counter>:<limit>[,<counter>:<limit>,...] Set the debug counter limit.
974 974
975fdebug-prefix-map= 975fdebug-prefix-map=
976Common Joined RejectNegative Var(common_deferred_options) Defer 976Common Joined RejectNegative Var(common_deferred_options) Defer
977Map one directory name to another in debug information 977Map one directory name prefix to another in debug information
 978
 979fdebug-regex-map=
 980Common Joined RejectNegative Var(common_deferred_options) Defer
 981Map one directory name to another in debug information using regular expression matching
978 982
979fdebug-types-section 983fdebug-types-section
980Common Report Var(flag_debug_types_section) Init(0) 984Common Report Var(flag_debug_types_section) Init(0)
981Output .debug_types section when using DWARF v4 debuginfo. 985Output .debug_types section when using DWARF v4 debuginfo.
982 986
983; Nonzero for -fdefer-pop: don't pop args after each function call 987; Nonzero for -fdefer-pop: don't pop args after each function call
984; instead save them up to pop many calls' args with one insns. 988; instead save them up to pop many calls' args with one insns.
985fdefer-pop 989fdefer-pop
986Common Report Var(flag_defer_pop) Optimization 990Common Report Var(flag_defer_pop) Optimization
987Defer popping functions args from stack until later 991Defer popping functions args from stack until later
988 992
989fdelayed-branch 993fdelayed-branch
990Common Report Var(flag_delayed_branch) Optimization 994Common Report Var(flag_delayed_branch) Optimization

cvs diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/opts.c (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/opts.c 2014/05/27 08:43:04 1.1.1.3
+++ src/external/gpl3/gcc/dist/gcc/opts.c 2016/01/09 02:05:00 1.2
@@ -1479,26 +1479,30 @@ common_handle_option (struct gcc_options @@ -1479,26 +1479,30 @@ common_handle_option (struct gcc_options
1479 case OPT_fcall_saved_: 1479 case OPT_fcall_saved_:
1480 /* Deferred. */ 1480 /* Deferred. */
1481 break; 1481 break;
1482 1482
1483 case OPT_fdbg_cnt_: 1483 case OPT_fdbg_cnt_:
1484 case OPT_fdbg_cnt_list: 1484 case OPT_fdbg_cnt_list:
1485 /* Deferred. */ 1485 /* Deferred. */
1486 break; 1486 break;
1487 1487
1488 case OPT_fdebug_prefix_map_: 1488 case OPT_fdebug_prefix_map_:
1489 /* Deferred. */ 1489 /* Deferred. */
1490 break; 1490 break;
1491 1491
 1492 case OPT_fdebug_regex_map_:
 1493 /* Deferred. */
 1494 break;
 1495
1492 case OPT_fdiagnostics_show_location_: 1496 case OPT_fdiagnostics_show_location_:
1493 diagnostic_prefixing_rule (dc) = (diagnostic_prefixing_rule_t) value; 1497 diagnostic_prefixing_rule (dc) = (diagnostic_prefixing_rule_t) value;
1494 break; 1498 break;
1495  1499
1496 case OPT_fdiagnostics_show_caret: 1500 case OPT_fdiagnostics_show_caret:
1497 dc->show_caret = value; 1501 dc->show_caret = value;
1498 break; 1502 break;
1499 1503
1500 case OPT_fdiagnostics_show_option: 1504 case OPT_fdiagnostics_show_option:
1501 dc->show_option_requested = value; 1505 dc->show_option_requested = value;
1502 break; 1506 break;
1503 1507
1504 case OPT_fdump_: 1508 case OPT_fdump_:

cvs diff -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/debug.h (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/debug.h 2014/03/01 08:42:10 1.1.1.2
+++ src/external/gpl3/gcc/dist/gcc/debug.h 2016/01/09 02:05:00 1.2
@@ -176,20 +176,21 @@ extern const struct gcc_debug_hooks vmsd @@ -176,20 +176,21 @@ extern const struct gcc_debug_hooks vmsd
176extern void dwarf2out_begin_prologue (unsigned int, const char *); 176extern void dwarf2out_begin_prologue (unsigned int, const char *);
177extern void dwarf2out_vms_end_prologue (unsigned int, const char *); 177extern void dwarf2out_vms_end_prologue (unsigned int, const char *);
178extern void dwarf2out_vms_begin_epilogue (unsigned int, const char *); 178extern void dwarf2out_vms_begin_epilogue (unsigned int, const char *);
179extern void dwarf2out_end_epilogue (unsigned int, const char *); 179extern void dwarf2out_end_epilogue (unsigned int, const char *);
180extern void dwarf2out_frame_finish (void); 180extern void dwarf2out_frame_finish (void);
181/* Decide whether we want to emit frame unwind information for the current 181/* Decide whether we want to emit frame unwind information for the current
182 translation unit. */ 182 translation unit. */
183extern bool dwarf2out_do_frame (void); 183extern bool dwarf2out_do_frame (void);
184extern bool dwarf2out_do_cfi_asm (void); 184extern bool dwarf2out_do_cfi_asm (void);
185extern void dwarf2out_switch_text_section (void); 185extern void dwarf2out_switch_text_section (void);
186 186
187const char *remap_debug_filename (const char *); 187const char *remap_debug_filename (const char *);
188void add_debug_prefix_map (const char *); 188void add_debug_prefix_map (const char *);
 189void add_debug_regex_map (const char *);
189 190
190/* For -fdump-go-spec. */ 191/* For -fdump-go-spec. */
191 192
192extern const struct gcc_debug_hooks * 193extern const struct gcc_debug_hooks *
193dump_go_spec_init (const char *, const struct gcc_debug_hooks *); 194dump_go_spec_init (const char *, const struct gcc_debug_hooks *);
194 195
195#endif /* !GCC_DEBUG_H */ 196#endif /* !GCC_DEBUG_H */

cvs diff -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/final.c (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/final.c 2015/12/22 16:49:08 1.2
+++ src/external/gpl3/gcc/dist/gcc/final.c 2016/01/09 02:05:00 1.3
@@ -1525,46 +1525,128 @@ add_debug_prefix_map (const char *arg) @@ -1525,46 +1525,128 @@ add_debug_prefix_map (const char *arg)
1525 map = XNEW (debug_prefix_map); 1525 map = XNEW (debug_prefix_map);
1526 map->old_prefix = old; 1526 map->old_prefix = old;
1527 map->old_len = oldlen; 1527 map->old_len = oldlen;
1528 p++; 1528 p++;
1529 map->new_prefix = xstrdup (p); 1529 map->new_prefix = xstrdup (p);
1530 map->new_len = strlen (p); 1530 map->new_len = strlen (p);
1531 map->next = debug_prefix_maps; 1531 map->next = debug_prefix_maps;
1532 debug_prefix_maps = map; 1532 debug_prefix_maps = map;
1533} 1533}
1534 1534
1535/* Perform user-specified mapping of debug filename prefixes. Return 1535/* Perform user-specified mapping of debug filename prefixes. Return
1536 the new name corresponding to FILENAME. */ 1536 the new name corresponding to FILENAME. */
1537 1537
1538const char * 1538static const char *
1539remap_debug_filename (const char *filename) 1539remap_debug_prefix_filename (const char *filename)
1540{ 1540{
1541 debug_prefix_map *map; 1541 debug_prefix_map *map;
1542 char *s; 1542 char *s;
1543 const char *name; 1543 const char *name;
1544 size_t name_len; 1544 size_t name_len;
1545 1545
1546 for (map = debug_prefix_maps; map; map = map->next) 1546 for (map = debug_prefix_maps; map; map = map->next)
1547 if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) 1547 if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)
1548 break; 1548 break;
1549 if (!map) 1549 if (!map)
1550 return filename; 1550 return filename;
1551 name = filename + map->old_len; 1551 name = filename + map->old_len;
1552 name_len = strlen (name) + 1; 1552 name_len = strlen (name) + 1;
1553 s = (char *) alloca (name_len + map->new_len); 1553 s = (char *) alloca (name_len + map->new_len);
1554 memcpy (s, map->new_prefix, map->new_len); 1554 memcpy (s, map->new_prefix, map->new_len);
1555 memcpy (s + map->new_len, name, name_len); 1555 memcpy (s + map->new_len, name, name_len);
1556 return ggc_strdup (s); 1556 return ggc_strdup (s);
1557} 1557}
 1558
 1559#include <regex.h>
 1560
 1561typedef struct debug_regex_map
 1562{
 1563 regex_t re;
 1564 const char *sub;
 1565 struct debug_regex_map *next;
 1566} debug_regex_map;
 1567
 1568/* Linked list of such structures. */
 1569debug_regex_map *debug_regex_maps;
 1570
 1571
 1572/* Record a debug file regex mapping. ARG is the argument to
 1573 -fdebug-regex-map and must be of the form OLD=NEW. */
 1574
 1575void
 1576add_debug_regex_map (const char *arg)
 1577{
 1578 debug_regex_map *map;
 1579 const char *p;
 1580 char *old;
 1581 char buf[1024];
 1582 regex_t re;
 1583 int e;
 1584
 1585 p = strchr (arg, '=');
 1586 if (!p)
 1587 {
 1588 error ("invalid argument %qs to -fdebug-regex-map", arg);
 1589 return;
 1590 }
 1591
 1592 old = xstrndup (arg, p - arg);
 1593 if ((e = regcomp(&re, old, REG_EXTENDED)) != 0)
 1594 {
 1595 regerror(e, &re, buf, sizeof(buf));
 1596 warning (0, "regular expression compilation for %qs in argument to "
 1597 "-fdebug-regex-map failed: %qs", old, buf);
 1598 free(old);
 1599 return;
 1600 }
 1601 free(old);
 1602
 1603 map = XNEW (debug_regex_map);
 1604 map->re = re;
 1605 p++;
 1606 map->sub = xstrdup (p);
 1607 map->next = debug_regex_maps;
 1608 debug_regex_maps = map;
 1609}
 1610
 1611extern ssize_t aregsub(char **, const char *,
 1612 const regmatch_t *rm, const char *);
 1613
 1614/* Perform user-specified mapping of debug filename regular expressions. Return
 1615 the new name corresponding to FILENAME. */
 1616
 1617static const char *
 1618remap_debug_regex_filename (const char *filename)
 1619{
 1620 debug_regex_map *map;
 1621 char *s;
 1622 regmatch_t rm[10];
 1623
 1624 for (map = debug_regex_maps; map; map = map->next)
 1625 if (regexec (&map->re, filename, 10, rm, 0) == 0
 1626 && aregsub (&s, map->sub, rm, filename) >= 0)
 1627 {
 1628 const char *name = ggc_strdup(s);
 1629 free(s);
 1630 return name;
 1631 }
 1632 return filename;
 1633}
 1634
 1635const char *
 1636remap_debug_filename (const char *filename)
 1637{
 1638 return remap_debug_regex_filename (remap_debug_prefix_filename (filename));
 1639}
1558  1640
1559/* Return true if DWARF2 debug info can be emitted for DECL. */ 1641/* Return true if DWARF2 debug info can be emitted for DECL. */
1560 1642
1561static bool 1643static bool
1562dwarf2_debug_info_emitted_p (tree decl) 1644dwarf2_debug_info_emitted_p (tree decl)
1563{ 1645{
1564 if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG) 1646 if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG)
1565 return false; 1647 return false;
1566 1648
1567 if (DECL_IGNORED_P (decl)) 1649 if (DECL_IGNORED_P (decl))
1568 return false; 1650 return false;
1569 1651
1570 return true; 1652 return true;

cvs diff -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/opts-global.c (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/opts-global.c 2014/03/01 08:42:52 1.1.1.1
+++ src/external/gpl3/gcc/dist/gcc/opts-global.c 2016/01/09 02:05:00 1.2
@@ -374,26 +374,30 @@ handle_common_deferred_options (void) @@ -374,26 +374,30 @@ handle_common_deferred_options (void)
374 374
375 case OPT_fdbg_cnt_: 375 case OPT_fdbg_cnt_:
376 dbg_cnt_process_opt (opt->arg); 376 dbg_cnt_process_opt (opt->arg);
377 break; 377 break;
378 378
379 case OPT_fdbg_cnt_list: 379 case OPT_fdbg_cnt_list:
380 dbg_cnt_list_all_counters (); 380 dbg_cnt_list_all_counters ();
381 break; 381 break;
382 382
383 case OPT_fdebug_prefix_map_: 383 case OPT_fdebug_prefix_map_:
384 add_debug_prefix_map (opt->arg); 384 add_debug_prefix_map (opt->arg);
385 break; 385 break;
386 386
 387 case OPT_fdebug_regex_map_:
 388 add_debug_regex_map (opt->arg);
 389 break;
 390
387 case OPT_fdump_: 391 case OPT_fdump_:
388 if (!dump_switch_p (opt->arg)) 392 if (!dump_switch_p (opt->arg))
389 error ("unrecognized command line option %<-fdump-%s%>", opt->arg); 393 error ("unrecognized command line option %<-fdump-%s%>", opt->arg);
390 break; 394 break;
391 395
392 case OPT_fopt_info_: 396 case OPT_fopt_info_:
393 if (!opt_info_switch_p (opt->arg)) 397 if (!opt_info_switch_p (opt->arg))
394 error ("unrecognized command line option %<-fopt-info-%s%>", 398 error ("unrecognized command line option %<-fopt-info-%s%>",
395 opt->arg); 399 opt->arg);
396 break; 400 break;
397 401
398 case OPT_fenable_: 402 case OPT_fenable_:
399 case OPT_fdisable_: 403 case OPT_fdisable_:

File Added: src/external/gpl3/gcc/dist/gcc/regsub.c
/*	$NetBSD: regsub.c,v 1.1 2016/01/09 02:05:00 christos Exp $	*/

/*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * This code is derived from software contributed to The NetBSD Foundation
 * by Christos Zoulas.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
#include <sys/cdefs.h>
__RCSID("$NetBSD: regsub.c,v 1.1 2016/01/09 02:05:00 christos Exp $");

#include <sys/param.h>

#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <regex.h>

struct str {
	char *s_ptr;
	size_t s_max;
	size_t s_len;
	int s_fixed;
};

static int
addspace(struct str *s, size_t len)
{
	void *v;

	if (s->s_max - s->s_len > len)
		return 0;

	if (s->s_fixed)
		return -1;

	s->s_max += MAX(len, 64);

	v = realloc(s->s_ptr, s->s_max);
	if (v == NULL)
		return -1;
	s->s_ptr = (char *)v;

	return 0;
}

static void
addchar(struct str *s, int c)
{
	if (addspace(s, 1) == -1)
		s->s_len++;
	else
		s->s_ptr[s->s_len++] = c;
	if (c == 0) {
		--s->s_len;
		s->s_ptr[s->s_max - 1] = c;	
	}
}

static void
addnstr(struct str *s, const char *buf, size_t len)
{
	if (addspace(s, len) != -1)
		memcpy(s->s_ptr + s->s_len, buf, len);
	s->s_len += len;
}

static int
initstr(struct str *s, char *buf, size_t len)
{
	s->s_max = len;
	s->s_ptr = buf == NULL ? (char *)malloc(len) : buf;
	s->s_fixed = buf != NULL;
	s->s_len = 0;
	return s->s_ptr == NULL ? -1 : 0;
}

static ssize_t
regsub1(char **buf, size_t len, const char *sub,
    const regmatch_t *rm, const char *str)
{
        ssize_t i;                 
        char c; 
	struct str s;

	if (initstr(&s, *buf, len) == -1)
		return -1;

        while ((c = *sub++) != '\0') {

		switch (c) {
		case '&':
			i = 0;
			break;
		case '\\':
			if (isdigit((unsigned char)*sub))
				i = *sub++ - '0';
			else
				i = -1;
			break;
		default:
			i = -1;
			break;
		}

                if (i == -1) {
                        if (c == '\\' && (*sub == '\\' || *sub == '&'))
                                c = *sub++;
			addchar(&s, c);
                } else if (rm[i].rm_so != -1 && rm[i].rm_eo != -1) {
                        size_t l = (size_t)(rm[i].rm_eo - rm[i].rm_so);
			addnstr(&s, str + rm[i].rm_so, l);
                }
        }

	addchar(&s, '\0');
	if (!s.s_fixed) {
		if (s.s_len >= s.s_max) {
			free(s.s_ptr);
			return -1;
		}
		*buf = s.s_ptr;
	}
	return s.s_len;
}

ssize_t
regsub(char *buf, size_t len, const char *sub, const regmatch_t *rm,
    const char *str)
{
	return regsub1(&buf, len, sub, rm, str);
}

ssize_t
aregsub(char **buf, const char *sub, const regmatch_t *rm, const char *str)
{
	*buf = NULL;
	return regsub1(buf, 64, sub, rm, str);
}

cvs diff -r1.1.1.3 -r1.2 src/external/gpl3/gcc/dist/gcc/config/rs6000/ppc-asm.h (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/gcc/config/rs6000/ppc-asm.h 2014/05/27 08:58:03 1.1.1.3
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/ppc-asm.h 2016/01/09 02:05:00 1.2
@@ -365,17 +365,17 @@ GLUE(.L,name): \ @@ -365,17 +365,17 @@ GLUE(.L,name): \
365# define CFI_ENDPROC .cfi_endproc 365# define CFI_ENDPROC .cfi_endproc
366# define CFI_OFFSET(reg, off) .cfi_offset reg, off 366# define CFI_OFFSET(reg, off) .cfi_offset reg, off
367# define CFI_DEF_CFA_REGISTER(reg) .cfi_def_cfa_register reg 367# define CFI_DEF_CFA_REGISTER(reg) .cfi_def_cfa_register reg
368# define CFI_RESTORE(reg) .cfi_restore reg 368# define CFI_RESTORE(reg) .cfi_restore reg
369#else 369#else
370# define CFI_STARTPROC 370# define CFI_STARTPROC
371# define CFI_ENDPROC 371# define CFI_ENDPROC
372# define CFI_OFFSET(reg, off) 372# define CFI_OFFSET(reg, off)
373# define CFI_DEF_CFA_REGISTER(reg) 373# define CFI_DEF_CFA_REGISTER(reg)
374# define CFI_RESTORE(reg) 374# define CFI_RESTORE(reg)
375#endif 375#endif
376#endif 376#endif
377 377
378#if defined __linux__ && !defined __powerpc64__ 378#if defined(__ELF__) && defined(__linux__) && !defined(__powerpc64__)
379 .section .note.GNU-stack 379 .section .note.GNU-stack
380 .previous 380 .previous
381#endif 381#endif

cvs diff -r1.24 -r1.25 src/external/gpl3/gcc/usr.bin/backend/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/usr.bin/backend/Makefile 2015/02/01 17:47:00 1.24
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile 2016/01/09 02:05:00 1.25
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.24 2015/02/01 17:47:00 chs Exp $ 1# $NetBSD: Makefile,v 1.25 2016/01/09 02:05:00 christos Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5LIB= backend 5LIB= backend
6 6
7SRCS= ${G_OBJS:.o=.c} ${G_out_file:T} 7SRCS= ${G_OBJS:.o=.c} ${G_out_file:T} regsub.c
8 8
9BOTH_CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} 9BOTH_CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
10CPPFLAGS+= ${BOTH_CPPFLAGS} -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\" 10CPPFLAGS+= ${BOTH_CPPFLAGS} -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\"
11HOST_CPPFLAGS+= ${BOTH_CPPFLAGS} -DGENERATOR_FILE 11HOST_CPPFLAGS+= ${BOTH_CPPFLAGS} -DGENERATOR_FILE
12DPSRCS+= insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h 12DPSRCS+= insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h
13CPPFLAGS+= -I${DIST}/libgcc 13CPPFLAGS+= -I${DIST}/libgcc
14CPPFLAGS+= -I${.CURDIR}/../../lib/libgcc/libgcov/arch/${MACHINE_ARCH} 14CPPFLAGS+= -I${.CURDIR}/../../lib/libgcc/libgcov/arch/${MACHINE_ARCH}
15 15
16CPPFLAGS.cppdefault.c+= -DPREFIX=\"/usr\" \ 16CPPFLAGS.cppdefault.c+= -DPREFIX=\"/usr\" \
17 -DNATIVE_SYSTEM_HEADER_DIR=\"${G_NATIVE_SYSTEM_HEADER_DIR}\" 17 -DNATIVE_SYSTEM_HEADER_DIR=\"${G_NATIVE_SYSTEM_HEADER_DIR}\"
18 18
19HOSTPROG_CXX= 1 19HOSTPROG_CXX= 1
20 20