Update.

[glibc.git] / csu / abi-note.S

diff --git a/csu/abi-note.S b/csu/abi-note.S
index a5014ab5cc8a7c802e1b1973241bc604638f9f7e..3dc984212480bef3e2feade7313e81fa08e6a058 100644 (file)
--- a/csu/abi-note.S
+++ b/csu/abi-note.S
@@ -1,30 +1,30 @@
 /* Special .init and .fini section support.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it
-   and/or modify it under the terms of the GNU Library General Public
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 2.1 of the License, or (at your option) any later version.
 
-   In addition to the permissions in the GNU Library General Public
+   In addition to the permissions in the GNU Lesser General Public
    License, the Free Software Foundation gives you unlimited
    permission to link the compiled version of this file with other
    programs, and to distribute those programs without any restriction
-   coming from the use of this file.  (The Library General Public
+   coming from the use of this file.  (The Lesser General Public
    License restrictions do apply in other respects; for example, they
    cover modification of the file, and distribution when not linked
    into another program.)
 
-   The GNU C Library is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /* Define an ELF note identifying the operating-system ABI that the
    executable was created for.  The ELF note information identifies a
@@ -50,10 +50,11 @@ offset      length  contents
    Linux community) use note type 1 and a vendor name string of "GNU"
    for a note descriptor that indicates ABI requirements.  The note data
    is four 32-bit words.  The first of these is an operating system
-   number (0=Hurd, 1=Linux, 2=Solaris, ...) and the remaining three
+   number (0=Linux, 1=Hurd, 2=Solaris, ...) and the remaining three
    identify the earliest release of that OS that supports this ABI.
    See abi-tags (top level) for details. */
 
+#include <config.h>
 #include <abi-tag.h>           /* OS-specific ABI tag value */
        
 /* The linker (GNU ld 2.8 and later) recognizes an allocated section whose
@@ -67,5 +68,6 @@ offset        length  contents
        .long  1                /* note type */
 0:     .asciz "GNU"            /* vendor name */
 1:     .align 4                
-2:     .long ABI_TAG           /* note data: the ABI tag */
+2:     .long __ABI_TAG_OS      /* note data: the ABI tag */
+       .long __ABI_TAG_VERSION
 3:     .align 4                /* pad out section */