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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51659 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index eb81010..c73ee80 100644 (file)
--- 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 5a4ab8c..17816e2 100644 (file)
--- 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 a518b51..e1b3526 100644 (file)
--- 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