#109 Changes for Amiga port

v0.8
closed-accepted
None
5
2008-12-04
2007-05-03
Chris Young
No

Changes required for Amiga port. Some of these patches involve commenting out code and will need to be changed to #ifndef AMIGA etc.

These are for the OS4 clib2-based port, further changes are necessary for newlib.

Discussion

1 2 3 > >> (Page 1 of 3)
  • Chris Young

    Chris Young - 2007-05-03

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: debugger_commandl.l.diff

     
  • Chris Young

    Chris Young - 2007-05-03

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: utils.c.diff

     
  • Chris Young

    Chris Young - 2007-05-05

    patch for compat/getopt.c

     
  • Chris Young

    Chris Young - 2007-05-05

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: compat_getopt.c.diff

     
  • Chris Young

    Chris Young - 2007-05-05

    patch for compat/getopt.h

     
  • Chris Young

    Chris Young - 2007-05-05

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: compat_getopt.h.diff

     
  • Chris Young

    Chris Young - 2007-05-05

    Logged In: YES
    user_id=990796
    Originator: YES

    debugger/commandl.l change has only been tested as far as compiling.

    File Added: debugger_commandl.l.diff

     
  • Chris Young

    Chris Young - 2007-05-05

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: utils.c.diff

     
  • Fredrick Meunier

    Logged In: YES
    user_id=11017
    Originator: NO

    Why do you comment out libgen,h in utils.c? Shouldn't the configure check have found that there were no libgen.h?

     
  • Chris Young

    Chris Young - 2007-05-18

    Logged In: YES
    user_id=990796
    Originator: YES

    I think that was a bit of commenting out that should have been reversed, as libgen.h is available and the code compiles with the header.

    I have spotted a temp dir path in the same file that needs fixing (quick hack - new diff attached), but I can't test any fix as I have no idea when fuse needs the temp directory.

    File Added: utils.c.diff

     
  • Chris Young

    Chris Young - 2007-05-18

    patch for utils.c

     
  • Fredrick Meunier

    Logged In: YES
    user_id=11017
    Originator: NO

    I've applied utils.c, we use the temp path when converting .scl TR-DOS images for use in Fuse. More to come.

     
  • Fredrick Meunier

    Logged In: YES
    user_id=11017
    Originator: NO

    I've applied the debugger part, what's the problem with getopt? I take it you have getopt, but not getopt_long?

     
  • Chris Young

    Chris Young - 2007-05-19

    Logged In: YES
    user_id=990796
    Originator: YES

    I've just reverted the changes back to the original, and it is compiling. I'm sure that was one of the first changes I made so I'm not sure what is going on here. For now, I would leave it alone as it seems to be working.

     
  • Chris Young

    Chris Young - 2007-05-21

    Logged In: YES
    user_id=990796
    Originator: YES

    Looks like the getopt problem only shows up when you try and compile something other than getopt.c :)

    SDK:clib2/lib/libc.a(unistd_getopt.o)(.sdata+0x0): multiple definition of `optind'
    compat/libcompat.a(getopt.o)(.sdata+0x8):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:313: first defined here
    SDK:clib2/lib/libc.a(unistd_getopt.o)(.sdata+0x4): multiple definition of `opterr'
    compat/libcompat.a(getopt.o)(.sdata+0x4):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:316: first defined here
    SDK:clib2/lib/libc.a(unistd_getopt.o)(.text+0x0): In function `getopt':
    : multiple definition of `getopt'
    compat/libcompat.a(getopt.o)(.text+0xe98):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:1204: first defined here
    gcc:ppc-amigaos/bin/ld: Warning: size of symbol `getopt' changed from 16 in SDK:clib2/lib/libc.a(unistd_getopt.o) to 680 in SDK:clib2/lib/libc.a(unistd_getopt.o)
    SDK:clib2/lib/libc.a(unistd_getopt.o)(.sbss+0x4): multiple definition of `optopt'
    compat/libcompat.a(getopt.o)(.sdata+0x0):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:313: first defined here

     
  • Fredrick Meunier

    Logged In: YES
    user_id=11017
    Originator: NO

    could you let us know what the value of HAVE_GETOPT_LONG is in config.h and attach your config.log? It looks like you have getopt but not getopt_long and the code may not be looking for that case? I think the simplest thing may be to redefine the built-in optind, getopt, opterr and optopt if we don't have getopt_long.

     
  • Chris Young

    Chris Young - 2007-05-23

    Logged In: YES
    user_id=990796
    Originator: YES

    It's not defined. config.log attached.

    /* Define to 1 if you have the `getopt_long' function. */
    /* #undef HAVE_GETOPT_LONG */

    File Added: config.log

     
  • Chris Young

    Chris Young - 2007-05-23

    config.log

     
  • Fredrick Meunier

    Logged In: YES
    user_id=11017
    Originator: NO

    I think the getopt problem is related to this one <http://osdir.com/ml/lib.gnulib.bugs/2004-06/msg00038.html>.

    It seem that uClibc uses GNU getopt but not getopt_long leading to the multiple definition, and I think that you are using a similar C library on the Amiga and getting a related problem.

    There seems to be a newer version of the replacement routines in gnulib, which seem to try harder not to clash with the built-in getopt, they seem to require gettext though.

    Maybe we should just omit getopt_long support for amiga?

     
  • Chris Young

    Chris Young - 2007-05-26

    Logged In: YES
    user_id=990796
    Originator: YES

    Sounds easiest, if it's not needed.

     
  • Chris Young

    Chris Young - 2007-05-28

    Logged In: YES
    user_id=990796
    Originator: YES

    This is a enhancement patch for libspectrum 0.3.0. It enables the Amiga version to decompress files with xfdmaster.library.

    File Added: libspectrum.c.diff

     
  • Chris Young

    Chris Young - 2007-05-28

    libspectrum: libspectrum.c

     
  • Chris Young

    Chris Young - 2007-05-28

    libspectrum: libspectrum.h.in (header changes needed for libspectrum.c patch)

     
  • Chris Young

    Chris Young - 2007-05-28

    Logged In: YES
    user_id=990796
    Originator: YES

    File Added: libspectrum.h.in.diff

     
1 2 3 > >> (Page 1 of 3)

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks