diff --git a/patches/sfdc/Dump.pl.diff b/patches/sfdc/Dump.pl.diff deleted file mode 100644 index d992c91..0000000 --- a/patches/sfdc/Dump.pl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- sfdc/Dump.pl 2005-09-24 16:49:49.000000000 +0200 -+++ sfdc/Dump.pl 2013-08-30 15:46:41.000000000 +0200 -@@ -19,7 +19,7 @@ - my $sfd = $self->{SFD}; - - print "SFD information\n"; -- print "ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ\n"; -+ print "---------------\n"; - print "Copyright: $$sfd{'copyright'}\n"; - print "RCS ID: $$sfd{'id'}\n"; - print "Module name: $$sfd{'libname'}\n"; diff --git a/patches/sfdc/Makefile.in.diff b/patches/sfdc/Makefile.in.diff deleted file mode 100644 index 946db5b..0000000 --- a/patches/sfdc/Makefile.in.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- sfdc/Makefile.in 2005-09-24 16:49:49.000000000 +0200 -+++ sfdc/Makefile.in 2013-08-30 15:09:31.000000000 +0200 -@@ -32,7 +32,7 @@ - $(RM) config.status Makefile - - install: all -- $(INSTALL) --directory $(bindir) $(mandir)/man1 -+ $(INSTALL) -d $(bindir) $(mandir)/man1 - $(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir) - $(INSTALL_DATA) $(MAN) $(mandir)/man1 - diff --git a/patches/sfdc/SFDCompile.pod.diff b/patches/sfdc/SFDCompile.pod.diff deleted file mode 100644 index 179e57d..0000000 --- a/patches/sfdc/SFDCompile.pod.diff +++ /dev/null @@ -1,145 +0,0 @@ ---- sfdc/SFDCompile.pod 2005-09-24 16:49:49.000000000 +0200 -+++ sfdc/SFDCompile.pod 2014-05-25 22:50:56.894529535 +0200 -@@ -334,7 +334,7 @@ - =head1 NOTES - - Had I seen F before I started writing this program, I --might still have been using fd/clib files. Or maybe not. -+might still have been using fd/clib files. Or maybe not. - - =head1 AUTHOR - -@@ -342,98 +342,114 @@ - - =head1 HISTORY - --=item B<1.0 (2003-07-27)> -+=over 4 -+ -+=item * -+ -+B<1.0 (2003-07-27)> - - Initial release. - - --=item B<1.1 (2003-12-22)> -+=item * -+ -+B<1.1 (2003-12-22)> - - Added workaround for workbench.library (base name is "wb"). - Added AmigaOS 4 support. - Added the B<--addvectors> switch. - - --=item B<1.2 (2004-06-16)> -+=item * -+ -+B<1.2 (2004-06-16)> - - Generates files for mathieeedoub*, though probably broken. Well they - are the same as fd2inline generates at least. - - --=item B<1.2a (2004-06-20)> -+=item * -+ -+B<1.2a (2004-06-20)> - - Replace AROS_LP with AROS_LD. Because it is guaranteed to define the - function prototype. [verhaegs] - --=item B<1.3 (2004-11-12)> -+=item * -+ -+B<1.3 (2004-11-12)> - - Correctly handle the argument C, where there is no - whitespace between the argument type and the argument name. - --=item -+=item * - - Correctly handle the prototype C, were there is - a whitespace between the function name and the parenthesis and "void" - is used to indicate no arguments. - --=item -+=item * - - Replace C<-> with C<_> in base/library name. - --=item -+=item * - - New special keyword for register specification (in addition to B - and B): B, which automatically allocates m68k registers - for the arguments. - --=item -+=item * - - B now works correctly with varargs functions. B combined - with B work for m68k and i386 only for now. For AROS - targets in B, the correct AROS macro is used to fetch the - function to be called. - --=item -+=item * - - New B<--mode>: B. For proper code generation in AROS, make - sure gateprotos are included before you include the functable. - --=item -+=item * - - B files now include F files when used in AROS. - --=item B<1.4 (2005-09-23)> -+=item * -+ -+B<1.4 (2005-09-23)> - - Added AmigaOS 4-style interfaces (C++ only for non-OS4 targets, and - without implementation). - --=item -+=item * - - The library base in the B file is now defined for AmigaOS 4 - too. - --=item -+=item * - - AmigaOS 4 B files now add B<__attribute__((linearvarargs))> to - varargs functions. - --=item -+=item * - - Added AmigaOS 4 support for B files. - --=item -+=item * - - Added support for the 'iptr' gcc attribute. - --=item -+=item * - - Added B<__SFDC_FUNCTABLE_M68K__> check in the B mode. - --=item -+=item * - - Added m68k stub functions to AmigaOS 4's B and - B. - --=item -+=item * - - Added the B mode. -+ -+=back diff --git a/patches/sfdc/main.pl.diff b/patches/sfdc/main.pl.diff deleted file mode 100644 index 5d238fb..0000000 --- a/patches/sfdc/main.pl.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- sfdc/main.pl 2005-09-24 16:49:49.000000000 +0200 -+++ sfdc/main.pl 2013-08-30 15:13:28.000000000 +0200 -@@ -420,7 +420,7 @@ - my $comment = ''; - - my $result = { -- copyright => 'Copyright İ 2001 Amiga, Inc.', -+ copyright => 'Copyright (c) 2001 Amiga, Inc.', - id => '', - libname => '', - base => '', -@@ -866,8 +866,8 @@ - - - # Make sure we have the same number of arguments as registers, or, -- # if this is a varargs function, possible one extra, á la "MethodID, ...". -- # Tagcalls always have one extra, á la "Tag, ...". -+ # if this is a varargs function, possible one extra, a la "MethodID, ...". -+ # Tagcalls always have one extra, a la "Tag, ...". - - if (($prototype->{type} eq 'varargs' && - $prototype->{subtype} eq 'tagcall' && diff --git a/submodules/sfdc b/submodules/sfdc index 736cc2e..cfd7fa1 160000 --- a/submodules/sfdc +++ b/submodules/sfdc @@ -1 +1 @@ -Subproject commit 736cc2efd5ff84d9c5ed24bab78294783b7479e5 +Subproject commit cfd7fa121c42078a2ccb831b33de4065ee8fc248 diff --git a/toolchain-m68k b/toolchain-m68k index b0d29d6..c82298c 100755 --- a/toolchain-m68k +++ b/toolchain-m68k @@ -350,7 +350,6 @@ def build(): make('fd2sfd', 'install') unpack('sfdc') - patch('sfdc') configure('sfdc', '--prefix={prefix}', copy_source=True) make('sfdc') make('sfdc', 'install')