* 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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9645d37c3c8fb779f36c8446797ee2dcf51709df..8ad2b93959203c46801da5ca6a6cd53c7386571f 100644 (file)
--- 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 1f9d2fa1734ec58be63185fb06a5b2b0acbe2a91..4eb974deb8636835dfce6a19a9627bc3f3495721 100644 (file)
--- 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 ca986a01bb4489c275ed1d04d1d9e74171e830be..9c9f9655eaa00c55259f8aa8076a0b314dfb8185 100644 (file)
--- 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 cf5b01ff3d08ae5cb068430d2951be80239507d2..2245f5ad2e2e4a0898ccab71555f2d4f29d1d5ef 100644 (file)
--- 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