gmon.c, [...]: Remove advertising clause from BSD license

        * gmon.c, i386/gmon-sol2.c, sparc/gmon-sol2.c: Remove advertising
        clause from BSD license

From-SVN: r30621

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60da1459a252ca1d69441e8eaa20302fb7d38cd6..9adf365e72f04c088820ce3986a105a6cda6e891 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+1999-11-22  Jason Merrill  <jason@casey.cygnus.com>
+
+       * gmon.c, i386/gmon-sol2.c, sparc/gmon-sol2.c: Remove advertising 
+       clause from BSD license, pursuant with
+
+         ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+
 1999-11-22  Bernd Schmidt  <bernds@cygnus.co.uk>
 
        * loop.c (load_mems): Reformat slightly.

diff --git a/gcc/config/i386/gmon-sol2.c b/gcc/config/i386/gmon-sol2.c
index 35ac1c9abb708b305919e36fe8a338f3c70338b5..8ea242b0a409e0b80da6918016e4ded2995f36d0 100644 (file)
--- a/gcc/config/i386/gmon-sol2.c
+++ b/gcc/config/i386/gmon-sol2.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
+ * 3. [rescinded 22 July 1999]
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/gcc/config/sparc/gmon-sol2.c b/gcc/config/sparc/gmon-sol2.c
index a6abcabcc51fa48efcaf67cebe41c0e5613e05bb..f629bc8e5e2983d40792870ff9186ae0cb451560 100644 (file)
--- a/gcc/config/sparc/gmon-sol2.c
+++ b/gcc/config/sparc/gmon-sol2.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
+ * 3. [rescinded 22 July 1999]
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

diff --git a/gcc/gmon.c b/gcc/gmon.c
index 2bb7366197ab2bb4cd45468aac6e969d3df60280..df9cfab2a1e655821dc7fc93d7c849accc970522 100644 (file)
--- a/gcc/gmon.c
+++ b/gcc/gmon.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
+ * 3. [rescinded 22 July 1999]
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.