From: Alexandre Oliva <aoliva@redhat.com>
Date: Sun, 31 Mar 2002 18:24:59 +0000 (+0000)
Subject: * libgcj.spec.in, libgcj-test.spec.in: Revert for now.
X-Git-Tag: releases/gcc-3.3.0~5993
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d05972d298cf96a5842ea1b4fd7c3a2ec7c21a99;p=thirdparty%2Fgcc.git

* libgcj.spec.in, libgcj-test.spec.in: Revert for now.

From-SVN: r51659
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index eb81010c8717..c73ee80b69aa 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,7 @@
 2002-03-31  Alexandre Oliva  <aoliva@redhat.com>
 
+	* libgcj.spec.in, libgcj-test.spec.in: Revert for now.
+
 	* libgcj.spec.in: Override libgcc, not lib.
 	* libgcj-test.spec.in: Likewise.
 
diff --git a/libjava/libgcj-test.spec.in b/libjava/libgcj-test.spec.in
index 5a4ab8c47c3e..17816e26442b 100644
--- a/libjava/libgcj-test.spec.in
+++ b/libjava/libgcj-test.spec.in
@@ -2,6 +2,6 @@
 # This spec file is read by gcj when linking.
 # It is only used by the testing harnesses (in libjava and gdb).
 #
-%rename libgcc libgccorig2
-*libgcc: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(libgccorig2)
+%rename lib liborig2
+*lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2)
 
diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index a518b51c6b38..e1b3526f9cb5 100644
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -3,7 +3,7 @@
 # It is used to specify the standard libraries we need in order
 # to link with libgcj.
 #
-%rename libgcc libgccorig
-*libgcc: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgccorig)
+%rename lib liborig
+*lib: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) %(liborig)
 
 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ -fkeep-inline-functions