summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-03-31 18:24:59 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2002-03-31 18:24:59 +0000
commitd05972d298cf96a5842ea1b4fd7c3a2ec7c21a99 (patch)
treeb654f7e863cea71414a6ed76288aa0bb58cb5b7a /libjava
parentba2b743542e9113a391d40c0ac4de75565c4f6d5 (diff)
downloadgcc-d05972d298cf96a5842ea1b4fd7c3a2ec7c21a99.tar.gz
* libgcj.spec.in, libgcj-test.spec.in: Revert for now.
From-SVN: r51659
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog2
-rw-r--r--libjava/libgcj-test.spec.in4
-rw-r--r--libjava/libgcj.spec.in4
3 files changed, 6 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index eb81010c871..c73ee80b69a 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 5a4ab8c47c3..17816e26442 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 a518b51c6b3..e1b3526f9cb 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