From b56bc85a40b31394439c3a29ddaf71f17654b83d Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sun, 31 Mar 2002 09:33:05 +0000 Subject: [PATCH] libgcj.spec.in: Override libgcc, not lib. * libgcj.spec.in: Override libgcc, not lib. * libgcj-test.spec.in: Likewise. From-SVN: r51640 --- libjava/ChangeLog | 5 +++++ libjava/libgcj-test.spec.in | 4 ++-- libjava/libgcj.spec.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8a79daac60c..eb81010c871 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-31 Alexandre Oliva + + * libgcj.spec.in: Override libgcc, not lib. + * libgcj-test.spec.in: Likewise. + 2002-03-29 Tom Tromey * java/net/natPlainDatagramSocketImpl.cc (close): New function. diff --git a/libjava/libgcj-test.spec.in b/libjava/libgcj-test.spec.in index 17816e26442..5a4ab8c47c3 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 lib liborig2 -*lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2) +%rename libgcc libgccorig2 +*libgcc: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(libgccorig2) diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in index e1b3526f9cb..a518b51c6b3 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 lib liborig -*lib: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) %(liborig) +%rename libgcc libgccorig +*libgcc: -lgcj -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgccorig) *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ -fkeep-inline-functions