mirror of
https://frontier.innolan.net/github/amigaos-cross-toolchain6.git
synced 2024-10-19 10:29:55 +00:00
Add fd2sfd tool to m68k-amigaos toolchain.
This commit is contained in:
@ -1,45 +0,0 @@
|
|||||||
--- fd2sfd-1.0/fd2inline.c.orig 2003-07-28 10:42:50.000000000 +0200
|
|
||||||
+++ fd2sfd-1.0/fd2inline.c 2014-01-06 10:29:56.000000000 +0100
|
|
||||||
@@ -406,7 +408,7 @@
|
|
||||||
|
|
||||||
if (fname)
|
|
||||||
{
|
|
||||||
- result=malloc(sizeof(fdFile));
|
|
||||||
+ result=calloc(1,sizeof(fdFile));
|
|
||||||
if (result)
|
|
||||||
{
|
|
||||||
result->file=fopen(fname, "r");
|
|
||||||
@@ -722,7 +724,7 @@
|
|
||||||
fdDef *result;
|
|
||||||
regs count;
|
|
||||||
|
|
||||||
- result=malloc(sizeof(fdDef));
|
|
||||||
+ result=calloc(1,sizeof(fdDef));
|
|
||||||
|
|
||||||
if (result)
|
|
||||||
{
|
|
||||||
@@ -2069,13 +2071,13 @@
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!(arrdefs=malloc(FDS*sizeof(fdDef*))))
|
|
||||||
+ if (!(arrdefs=calloc(FDS,sizeof(fdDef*))))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "No mem for FDs\n");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
goto quit;
|
|
||||||
}
|
|
||||||
- if (!(arrcmts=malloc(FDS*sizeof(char*))))
|
|
||||||
+ if (!(arrcmts=calloc(FDS,sizeof(char*))))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "No mem for FD comments\n");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
@@ -2126,7 +2128,7 @@
|
|
||||||
/* Make a copy before we sort, since we need to process the
|
|
||||||
definitions in bias order, not lexical order */
|
|
||||||
|
|
||||||
- if (!(defs=malloc(fds*sizeof(fdDef*))))
|
|
||||||
+ if (!(defs=calloc(fds,sizeof(fdDef*))))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "No mem for FDs\n");
|
|
||||||
rc = EXIT_FAILURE;
|
|
||||||
@ -1,19 +1,10 @@
|
|||||||
--- fd2sfd-1.0/Makefile.in 2003-07-31 08:10:19.000000000 +0200
|
--- fd2sfd/Makefile.in 2003-07-31 08:10:19.000000000 +0200
|
||||||
+++ fd2sfd-1.0/Makefile.in 2014-05-29 00:09:00.000000000 +0200
|
+++ fd2sfd/Makefile.in 2014-05-29 00:09:00.000000000 +0200
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
|
|
||||||
INSTALL = @INSTALL@
|
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
|
|
||||||
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
|
||||||
|
|
||||||
VPATH = $(srcdir)
|
|
||||||
@@ -40,49 +41,11 @@
|
@@ -40,49 +41,11 @@
|
||||||
|
|
||||||
# Install tools
|
# Install tools
|
||||||
$(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)
|
$(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)
|
||||||
- $(INSTALL_PROGRAM) cross/bin/gg-fix-includes $(bindir)
|
$(INSTALL_SCRIPT) cross/bin/gg-fix-includes $(bindir)
|
||||||
+ $(INSTALL_SCRIPT) cross/bin/gg-fix-includes $(bindir)
|
|
||||||
for f in `cd $(srcdir)/cross/share/ && find * -type f`; do \
|
for f in `cd $(srcdir)/cross/share/ && find * -type f`; do \
|
||||||
- $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
|
- $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
|
||||||
- done
|
- done
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- sfdc-1.5/Dump.pl 2005-09-24 16:49:49.000000000 +0200
|
--- sfdc/Dump.pl 2005-09-24 16:49:49.000000000 +0200
|
||||||
+++ sfdc-1.5/Dump.pl 2013-08-30 15:46:41.000000000 +0200
|
+++ sfdc/Dump.pl 2013-08-30 15:46:41.000000000 +0200
|
||||||
@@ -19,7 +19,7 @@
|
@@ -19,7 +19,7 @@
|
||||||
my $sfd = $self->{SFD};
|
my $sfd = $self->{SFD};
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- sfdc-1.5/Makefile.in 2005-09-24 16:49:49.000000000 +0200
|
--- sfdc/Makefile.in 2005-09-24 16:49:49.000000000 +0200
|
||||||
+++ sfdc-1.5/Makefile.in 2013-08-30 15:09:31.000000000 +0200
|
+++ sfdc/Makefile.in 2013-08-30 15:09:31.000000000 +0200
|
||||||
@@ -32,7 +32,7 @@
|
@@ -32,7 +32,7 @@
|
||||||
$(RM) config.status Makefile
|
$(RM) config.status Makefile
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- sfdc-1.5/SFDCompile.pod 2005-09-24 16:49:49.000000000 +0200
|
--- sfdc/SFDCompile.pod 2005-09-24 16:49:49.000000000 +0200
|
||||||
+++ sfdc-1.5/SFDCompile.pod 2014-05-25 22:50:56.894529535 +0200
|
+++ sfdc/SFDCompile.pod 2014-05-25 22:50:56.894529535 +0200
|
||||||
@@ -326,7 +326,7 @@
|
@@ -326,7 +326,7 @@
|
||||||
=head1 NOTES
|
=head1 NOTES
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- sfdc-1.5/main.pl 2005-09-24 16:49:49.000000000 +0200
|
--- sfdc/main.pl 2005-09-24 16:49:49.000000000 +0200
|
||||||
+++ sfdc-1.5/main.pl 2013-08-30 15:13:28.000000000 +0200
|
+++ sfdc/main.pl 2013-08-30 15:13:28.000000000 +0200
|
||||||
@@ -418,7 +418,7 @@
|
@@ -418,7 +418,7 @@
|
||||||
my $comment = '';
|
my $comment = '';
|
||||||
|
|
||||||
@ -21,8 +21,9 @@ URLS = \
|
|||||||
'ftp://ftp.gnu.org/gnu/gcc/gcc-2.95.3/gcc-g++-2.95.3.tar.gz',
|
'ftp://ftp.gnu.org/gnu/gcc/gcc-2.95.3/gcc-g++-2.95.3.tar.gz',
|
||||||
('http://fossies.org/linux/misc/old/flex-2.5.4a.tar.gz',
|
('http://fossies.org/linux/misc/old/flex-2.5.4a.tar.gz',
|
||||||
'flex-2.5.4.tar.gz'),
|
'flex-2.5.4.tar.gz'),
|
||||||
('git://github.com/cahirwpz/libnix', 'libnix-2.2'),
|
'git://github.com/cahirwpz/libnix',
|
||||||
('git://github.com/adtools/sfdc', 'sfdc-1.5'),
|
'git://github.com/cahirwpz/fd2sfd',
|
||||||
|
'git://github.com/adtools/sfdc',
|
||||||
('http://www.haage-partner.de/download/AmigaOS/NDK39.lha', 'NDK_3.9.lha'),
|
('http://www.haage-partner.de/download/AmigaOS/NDK39.lha', 'NDK_3.9.lha'),
|
||||||
('ftp://ftp.exotica.org.uk/mirrors/geekgadgets/amiga/m68k/snapshots/' +
|
('ftp://ftp.exotica.org.uk/mirrors/geekgadgets/amiga/m68k/snapshots/' +
|
||||||
'990529/bin/libamiga-bin.tgz', 'libamiga.tar.gz'),
|
'990529/bin/libamiga-bin.tgz', 'libamiga.tar.gz'),
|
||||||
@ -298,11 +299,17 @@ def make():
|
|||||||
build('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
|
build('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
|
||||||
install('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
|
install('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
|
||||||
|
|
||||||
unpack('{sfdc}')
|
unpack('fd2sfd')
|
||||||
patch('{sfdc}')
|
patch('fd2sfd')
|
||||||
configure('{sfdc}', '--prefix={target}', copy_source=True)
|
configure('fd2sfd', '--prefix={target}', copy_source=True)
|
||||||
build('{sfdc}')
|
build('fd2sfd')
|
||||||
install('{sfdc}')
|
install('fd2sfd')
|
||||||
|
|
||||||
|
unpack('sfdc')
|
||||||
|
patch('sfdc')
|
||||||
|
configure('sfdc', '--prefix={target}', copy_source=True)
|
||||||
|
build('sfdc')
|
||||||
|
install('sfdc')
|
||||||
|
|
||||||
unpack('{NDK}')
|
unpack('{NDK}')
|
||||||
patch('{NDK}')
|
patch('{NDK}')
|
||||||
@ -311,21 +318,21 @@ def make():
|
|||||||
unpack('libamiga', top_dir='.')
|
unpack('libamiga', top_dir='.')
|
||||||
install_libamiga()
|
install_libamiga()
|
||||||
|
|
||||||
unpack('{libnix}')
|
unpack('libnix')
|
||||||
configure('{libnix}',
|
configure('libnix',
|
||||||
'--prefix={target}',
|
'--prefix={target}',
|
||||||
'--host=i686-linux-gnu',
|
'--host=i686-linux-gnu',
|
||||||
'--target=m68k-amigaos')
|
'--target=m68k-amigaos')
|
||||||
build('{libnix}',
|
build('libnix',
|
||||||
CC='m68k-amigaos-gcc',
|
CC='m68k-amigaos-gcc',
|
||||||
CPP='m68k-amigaos-gcc -E',
|
CPP='m68k-amigaos-gcc -E',
|
||||||
AR='m68k-amigaos-ar',
|
AR='m68k-amigaos-ar',
|
||||||
AS='m68k-amigaos-as',
|
AS='m68k-amigaos-as',
|
||||||
RANLIB='m68k-amigaos-ranlib',
|
RANLIB='m68k-amigaos-ranlib',
|
||||||
LD='m68k-amigaos-ld')
|
LD='m68k-amigaos-ld')
|
||||||
install('{libnix}')
|
install('libnix')
|
||||||
|
|
||||||
copy('{sources}/{libnix}/sources/headers/stabs.h',
|
copy('{sources}/libnix/sources/headers/stabs.h',
|
||||||
'{target}/m68k-amigaos/sys-include')
|
'{target}/m68k-amigaos/sys-include')
|
||||||
|
|
||||||
unpack('{libm}', top_dir='contrib/libm')
|
unpack('{libm}', top_dir='contrib/libm')
|
||||||
@ -395,9 +402,7 @@ if __name__ == "__main__":
|
|||||||
autoconf='autoconf-2.13',
|
autoconf='autoconf-2.13',
|
||||||
texinfo='texinfo-4.12',
|
texinfo='texinfo-4.12',
|
||||||
NDK='NDK_3.9',
|
NDK='NDK_3.9',
|
||||||
sfdc='sfdc-1.5',
|
|
||||||
ixemul='ixemul-48.2',
|
ixemul='ixemul-48.2',
|
||||||
libnix='libnix-2.2',
|
|
||||||
libm='libm-5.4',
|
libm='libm-5.4',
|
||||||
binutils='binutils-{binutils_ver}',
|
binutils='binutils-{binutils_ver}',
|
||||||
gcc_core='gcc-core-{gcc_ver}',
|
gcc_core='gcc-core-{gcc_ver}',
|
||||||
|
|||||||
Reference in New Issue
Block a user