diff options
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/ldgram.y | 10 | ||||
| -rw-r--r-- | ld/ldlang.c | 5 | ||||
| -rw-r--r-- | ld/ldlang.h | 7 |
4 files changed, 15 insertions, 14 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 9645d37..8ad2b93 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2006-06-07 Alan Modra <amodra@bigpond.net.au> + + * ldlang.h (enum section_type): Delete dsect_section, copy_section, + info_section and overlay_section. Add noalloc_section. + * ldlang.c (lang_add_section): Adjust. + * ldgram.y (type): Adjust. + 2006-06-06 Alan Modra <amodra@bigpond.net.au> * ldlang.c (init_os): Whitespace. diff --git a/ld/ldgram.y b/ld/ldgram.y index 1f9d2fa..4eb974d 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1,6 +1,6 @@ /* A YACC grammar to parse a superset of the AT&T linker scripting language. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com). This file is part of GNU ld. @@ -963,10 +963,10 @@ section: NAME { ldlex_expression(); } type: NOLOAD { sectype = noload_section; } - | DSECT { sectype = dsect_section; } - | COPY { sectype = copy_section; } - | INFO { sectype = info_section; } - | OVERLAY { sectype = overlay_section; } + | DSECT { sectype = noalloc_section; } + | COPY { sectype = noalloc_section; } + | INFO { sectype = noalloc_section; } + | OVERLAY { sectype = noalloc_section; } ; atype: diff --git a/ld/ldlang.c b/ld/ldlang.c index ca986a0..9c9f965 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1962,10 +1962,7 @@ lang_add_section (lang_statement_list_type *ptr, { case normal_section: break; - case dsect_section: - case copy_section: - case info_section: - case overlay_section: + case noalloc_section: output->bfd_section->flags &= ~SEC_ALLOC; break; case noload_section: diff --git a/ld/ldlang.h b/ld/ldlang.h index cf5b01f..2245f5a 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -1,6 +1,6 @@ /* ldlang.h - linker command language support Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -108,11 +108,8 @@ typedef struct lang_output_statement_struct enum section_type { normal_section, - dsect_section, - copy_section, noload_section, - info_section, - overlay_section + noalloc_section }; /* This structure holds a list of program headers describing |