Skip to content

Commit cb0da53

Browse files
ygrekygrek
committed
drop md4 i?86 specific asm implementations
1 parent dc92b0f commit cb0da53

File tree

9 files changed

+25
-4251
lines changed

9 files changed

+25
-4251
lines changed

‎config/Makefile.config.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ LABLGL_CMXA=@LABLGL_CMXA@
3333
MORE_TARGETS=@MORE_TARGETS@
3434
MORE_SUBDIRS=@MORE_SUBDIRS@
3535

36-
MD4ARCH=@MD4ARCH@
37-
MD4COMP=@MD4COMP@
38-
3936
OPENNAP=@OPEN_NAPSTER@
4037
DIRECT_CONNECT=@DIRECT_CONNECT@
4138
GNUTELLA=@GNUTELLA@
@@ -51,7 +48,6 @@ FILETP=@FILETP@
5148

5249
GUI=@GUI@
5350

54-
ARCH=@ARCH@
5551
SYSTEM=@SYSTEM@
5652
REQUIRED_OCAML=@REQUIRED_OCAML@
5753
REQUIRED_LABLGTK=@REQUIRED_LABLGTK@

‎config/Makefile.in

Lines changed: 25 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,19 +1433,12 @@ ocamldoc_html: $(CORE_DOC) $(libclient_DOC)
14331433
mkdir -p ocamldoc
14341434
$(OCAMLDOC) -sort -dump ocamldoc/ocamldocdump -html -d ocamldoc $(INCLUDES) $(libclient_DOC) $(CORE_DOC)
14351435

1436-
$(LIB)/md4_cc.o: $(LIB)/md4.c
1437-
$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
1436+
$(LIB)/md4_comp.o: $(LIB)/md4_comp.c
1437+
$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_comp.o" -ccopt "" -c $(LIB)/md4_comp.c
14381438

14391439
$(CDK)/heap_c.o: $(CDK)/heap_c.c
14401440
$(OCAMLC) -ccopt "$(CFLAGS) $(MORECFLAGS) -o $(CDK)/heap_c.o" -ccopt "" -c $(CDK)/heap_c.c
14411441

1442-
$(LIB)/md4_as.o: $(LIB)/md4_$(MD4ARCH).s
1443-
as -o $(LIB)/md4_as.o $(LIB)/md4_$(MD4ARCH).s
1444-
1445-
$(LIB)/md4_comp.o: $(LIB)/md4_$(MD4COMP).o
1446-
cp -f $(LIB)/md4_$(MD4COMP).o $(LIB)/md4_comp.o
1447-
1448-
14491442
zogml:
14501443
(for i in $(GUI_CODE)/gui*_base.zog ; do \
14511444
$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i -o $(GUI_CODE)/`basename $$i zog`ml ;\
@@ -1474,7 +1467,7 @@ clean:
14741467
rm -f svg_converter.exe mld_hash.exe make_torrent.exe bt_dht_node.exe copysources.exe get_range.exe subconv.exe testrss.exe
14751468
rm -f tests tests.exe
14761469
(for i in $(SUBDIRS); do \
1477-
rm -f $$i/*.cm? $$i/*.o $$i/*.annot ; \
1470+
rm -f $$i/*.cm? $$i/*.cmti $$i/*.o $$i/*.annot ; \
14781471
done)
14791472

14801473
tmpclean:
@@ -1636,8 +1629,8 @@ release.shared: opt
16361629
done
16371630
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16381631
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1639-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1640-
$(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s`$(GLIBC_VERSION_ARCH).tar
1632+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1633+
$(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s`$(GLIBC_VERSION_ARCH).tar
16411634

16421635
release.static: static opt
16431636
rm -rf mldonkey-*
@@ -1647,26 +1640,26 @@ release.static: static opt
16471640
done
16481641
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16491642
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1650-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1651-
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1643+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1644+
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
16521645

16531646
release.mlnet.static: mlnet.static
16541647
rm -rf mldonkey-*
16551648
cp -R distrib $(DISDIR)
16561649
cp mlnet.static $(DISDIR)/mlnet && strip $(DISDIR)/mlnet
16571650
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16581651
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1659-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1660-
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1652+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1653+
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
16611654

16621655
release.mlnet.byte.static: mlnet.byte.static
16631656
rm -rf mldonkey-*
16641657
cp -R distrib $(DISDIR)
16651658
cp mlnet.byte.static $(DISDIR)/mlnet
16661659
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16671660
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1668-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1669-
$(COMPRESS) mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1661+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).byte.static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1662+
$(COMPRESS) mldonkey-$(CURRENT_VERSION).byte.static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
16701663

16711664
release.mlnet.distri: mlnet mlnet.static
16721665
rm -rf mldonkey-*
@@ -1679,8 +1672,8 @@ release.mlnet.distri: mlnet mlnet.static
16791672
done
16801673
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16811674
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1682-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1683-
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1675+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1676+
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
16841677

16851678
release.utils.shared: mld_hash $(BT_UTILS)
16861679
rm -rf mldonkey-*
@@ -1693,8 +1686,8 @@ release.utils.shared: mld_hash $(BT_UTILS)
16931686
done
16941687
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
16951688
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1696-
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1697-
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1689+
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1690+
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
16981691

16991692
release.utils.static: mld_hash.static $(BT_UTILS_STATIC)
17001693
rm -rf mldonkey-*
@@ -1705,8 +1698,8 @@ ifeq ("$(BITTORRENT)", "yes")
17051698
endif
17061699
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
17071700
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
1708-
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1709-
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1701+
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
1702+
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
17101703

17111704
release.sources:
17121705
rm -f config/Makefile.config
@@ -1721,8 +1714,8 @@ $(DISDIR): static distrib/Readme.txt
17211714
cp $$i.static $(DISDIR)/$$i && strip $(DISDIR)/$$i; \
17221715
done
17231716
tar cf $(DISDIR).tar $(DISDIR)
1724-
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
1725-
bzip2 mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
1717+
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
1718+
bzip2 mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
17261719

17271720
SHADIR=mldonkey-shared
17281721

@@ -1735,61 +1728,21 @@ $(SHADIR): static distrib/Readme.txt
17351728
cp $$i.static $(SHADIR)/$$i && strip $(SHADIR)/$$i; \
17361729
done
17371730
tar cf $(SHADIR).tar $(SHADIR)
1738-
mv $(SHADIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
1739-
bzip2 mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
1740-
1741-
auto-release:
1742-
## i386
1743-
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
1744-
./configure --host=i386-pc-linux-gnu
1745-
rm -f mlnet mlnet.static mlnet+gui mlnet+gui.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
1746-
$(MAKE) opt static
1747-
$(MAKE) distrib
1748-
cp mldonkey-$(CURRENT_VERSION).static.i386-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1749-
$(MAKE) shared
1750-
cp mldonkey-$(CURRENT_VERSION).shared.i386-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1751-
## i686
1752-
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
1753-
./configure --host=i686-pc-linux-gnu
1754-
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
1755-
$(MAKE) opt static
1756-
$(MAKE) distrib
1757-
cp mldonkey-$(CURRENT_VERSION).static.i686-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1758-
$(MAKE) shared
1759-
cp mldonkey-$(CURRENT_VERSION).shared.i686-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1760-
## i586
1761-
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
1762-
./configure --host=i586-pc-linux-gnu
1763-
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
1764-
$(MAKE) opt static
1765-
$(MAKE) distrib
1766-
cp mldonkey-$(CURRENT_VERSION).static.i586-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1767-
$(MAKE) shared
1768-
cp mldonkey-$(CURRENT_VERSION).shared.i586-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1769-
## i486
1770-
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
1771-
./configure --host=i486-pc-linux-gnu
1772-
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
1773-
$(MAKE) opt static
1774-
$(MAKE) distrib
1775-
cp mldonkey-$(CURRENT_VERSION).static.i486-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1776-
$(MAKE) shared
1777-
cp mldonkey-$(CURRENT_VERSION).shared.i486-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
1778-
1779-
buildrpm:
1780-
./configure --host=i586-pc-linux-gnu
1731+
mv $(SHADIR).tar mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
1732+
bzip2 mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
1733+
1734+
buildrpm:
1735+
./configure
17811736
$(MAKE) clean
17821737
$(MAKE) opt
17831738
rm -rf ../mldonkey-rpm rpm/mldonkey
17841739
rm -f rpm/mldonkey.sources.tar.bz2
17851740
cp -dpR . ../mldonkey-rpm
17861741
mv ../mldonkey-rpm rpm/mldonkey
1787-
cd rpm/mldonkey; rm -rf **/*.cm? **/*.o
1742+
cd rpm/mldonkey; rm -rf **/*.cm? **/*.o
17881743
cd rpm; tar jcf mldonkey.sources.tar.bz2 mldonkey
17891744
rm -rf rpm/mldonkey
17901745

1791-
1792-
17931746
sourcedist: copysources
17941747
./copysources
17951748
cp packages/rpm/mldonkey.spec /tmp/mldonkey/

‎config/configure

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,6 @@ SCM_VERSION
686686
MLDONKEY_VERSION
687687
CHECKBOUNDS
688688
COMPRESS_EXT
689-
ARCH
690689
REQUIRED_LABLGTK
691690
GUI
692691
DONKEY_SERVER
@@ -703,8 +702,6 @@ GNUTELLA
703702
DIRECT_CONNECT
704703
OPEN_NAPSTER
705704
ICONV
706-
MD4COMP
707-
MD4ARCH
708705
LABLGL_CMXA
709706
LABLGL_CMA
710707
MORE_SUBDIRS
@@ -4470,21 +4467,6 @@ case "$host" in
44704467
ia64-*-linux*) arch=ia64; system=linux;;
44714468
esac
44724469

4473-
MD4ARCH=$arch
4474-
case $host in
4475-
i386-pc-linux*|i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;
4476-
i486-pc-linux*|i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;
4477-
i586-pc-linux*|i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;
4478-
i686-pc-linux*|i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;
4479-
i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;
4480-
i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;
4481-
i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;
4482-
i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;
4483-
*) MD4COMP=cc;;
4484-
esac
4485-
4486-
ARCH=$arch
4487-
44884470
# Parse git version if available
44894471

44904472
if test -d ../.git; then
@@ -11516,9 +11498,6 @@ fi
1151611498

1151711499

1151811500

11519-
11520-
11521-
1152211501

1152311502

1152411503

‎config/configure.in

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -172,52 +172,6 @@ if test "x$SYSTEM" = "xunknown"; then
172172
exit 1
173173
fi
174174

175-
case "$host" in
176-
alpha*-*-osf*) arch=alpha; system=digital;;
177-
alpha*-*-linux*) arch=alpha; system=linux;;
178-
alpha*-*-freebsd*) arch=alpha; system=freebsd;;
179-
alpha*-*-netbsd*) arch=alpha; system=netbsd;;
180-
alpha*-*-openbsd*) arch=alpha; system=openbsd;;
181-
sparc-*-sunos4.*) arch=sparc; system=sunos;;
182-
sparc-*-solaris2.*) arch=sparc; system=solaris;;
183-
sparc-*-*bsd*) arch=sparc; system=bsd;;
184-
sparc-*-linux*) arch=sparc; system=linux;;
185-
i?86-*-linux*) arch=i386; system=linux;;
186-
i386-*-*bsd*) arch=i386; system=bsd;;
187-
i486-*-*bsd*) arch=i486; system=bsd;;
188-
i586-*-*bsd*) arch=i586; system=bsd;;
189-
i686-*-*bsd*) arch=i686; system=bsd;;
190-
i?86-*-nextstep*) arch=i386; system=nextstep;;
191-
i?86-*-solaris*) arch=i386; system=solaris;;
192-
i?86-*-beos*) arch=i386; system=beos;;
193-
i?86-*-cygwin*) arch=i386; system=cygwin;;
194-
mips-*-irix6*) arch=mips; system=irix;;
195-
hppa1.1-*-hpux*) arch=hppa; system=hpux;;
196-
hppa1.1-*-nextstep*) arch=hppa; system=nextstep;;
197-
rs6000-*-aix*) arch=power; model=rs6000; system=aix;;
198-
powerpc-*-aix*) arch=power; model=ppc; system=aix;;
199-
powerpc-*-linux*) arch=power; model=ppc; system=elf;;
200-
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
201-
powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;;
202-
arm*-*-linux*) arch=arm; system=linux;;
203-
ia64-*-linux*) arch=ia64; system=linux;;
204-
esac
205-
206-
MD4ARCH=$arch
207-
case $host in
208-
i386-pc-linux*|i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;
209-
i486-pc-linux*|i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;
210-
i586-pc-linux*|i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;
211-
i686-pc-linux*|i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;
212-
i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;
213-
i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;
214-
i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;
215-
i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;
216-
*) MD4COMP=cc;;
217-
esac
218-
219-
ARCH=$arch
220-
221175
# Parse git version if available
222176

223177
if test -d ../.git; then
@@ -1299,8 +1253,6 @@ AC_SUBST(MORE_TARGETS)
12991253
AC_SUBST(MORE_SUBDIRS)
13001254
AC_SUBST(LABLGL_CMA)
13011255
AC_SUBST(LABLGL_CMXA)
1302-
AC_SUBST(MD4ARCH)
1303-
AC_SUBST(MD4COMP)
13041256
AC_SUBST(ICONV)
13051257
AC_SUBST(OPEN_NAPSTER)
13061258
AC_SUBST(DIRECT_CONNECT)
@@ -1317,7 +1269,6 @@ AC_SUBST(DONKEY_SUI_FILE)
13171269
AC_SUBST(DONKEY_SERVER)
13181270
AC_SUBST(GUI)
13191271
AC_SUBST(REQUIRED_LABLGTK)
1320-
AC_SUBST(ARCH)
13211272
AC_SUBST(COMPRESS)
13221273
AC_SUBST(COMPRESS_EXT)
13231274
AC_SUBST(CHECKBOUNDS)

‎src/utils/lib/md4.c renamed to ‎src/utils/lib/md4_comp.c

File renamed without changes.

0 commit comments

Comments
 (0)