Help stupid cvs fixing basic conflicts.

1 files changed, 9 insertions, 3 deletions

diff --git a/gnu/usr.bin/binutils/ld/ldctor.h b/gnu/usr.bin/binutils/ld/ldctor.h
index d87f0dbd5f9..d873f77f327 100644
--- a/gnu/usr.bin/binutils/ld/ldctor.h
+++ b/gnu/usr.bin/binutils/ld/ldctor.h
@@ -1,5 +1,5 @@
 /* ldctor.h - linker constructor support
-   Copyright 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1991, 92, 93, 94, 95, 1998 Free Software Foundation, Inc.
    
 This file is part of GLD, the Gnu Linker.
 
@@ -14,8 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GLD; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+along with GLD; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
 #ifndef LDCTOR_H
 #define LDCTOR_H
@@ -23,6 +24,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
 /* List of statements needed to handle constructors */
 extern lang_statement_list_type constructor_list;
 
+/* Whether the constructors should be sorted.  Note that this is
+   global for the entire link; we assume that there is only a single
+   CONSTRUCTORS command in the linker script.  */
+extern boolean constructors_sorted;
+
 /* We keep a list of these structures for each set we build.  */
 
 struct set_info