diff --git a/gold/ChangeLog b/gold/ChangeLog index f1cd70e814..af137fce01 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,7 @@ +2008-03-24 Ian Lance Taylor + + * x86_64.cc: Correct license to GPLv3. + 2008-03-23 Ian Lance Taylor * options.cc: Include "demangle.h". diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 4c6a1739b2..b64f6a8e9a 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -5,29 +5,20 @@ // This file is part of gold. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public License -// as published by the Free Software Foundation; either version 2, or +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 3 of the License, or // (at your option) any later version. -// In addition to the permissions in the GNU Library General Public -// License, the Free Software Foundation gives you unlimited -// permission to link the compiled version of this file into -// combinations with other programs, and to distribute those -// combinations without any restriction coming from the use of this -// file. (The Library Public License restrictions do apply in other -// respects; for example, they cover modification of the file, and -/// distribution when not linked into a combined executable.) +// This program 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 General Public License for more details. -// This program 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. - -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -// 02110-1301, USA. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +// MA 02110-1301, USA. #include "gold.h"