← Back to branch summary

~ubuntu-branches/ubuntu/natty/qemu-linaro/natty

« back to all changes in this revision

Viewing changes to linux-user/main.c

  • Committer: Package Import Robot
  • Author(s): Steve Langasek, Loïc Minier, Steve Langasek
  • Date: 2011-03-07 22:55:03 UTC
  • Revision ID: package-import@ubuntu.com-20110307225503-3opjapw0ksg7glo6
[ Loïc Minier ]
* Also pass -fno-var-tracking on armhf.

[ Steve Langasek ]
* New upstream release.
* Build with -marm on armel/armhf; Peter Maydell reports that building for
  Thumb-2 gives an emulator that doesn't work.
* Add support for cross-compiling the package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linux-user/main.c
2624
2624
}
2625
2625
#endif /* TARGET_ALPHA */
2626
2626
 
 
2627
static void version(void)
 
2628
{
 
2629
    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION
 
2630
           ", Copyright (c) 2003-2008 Fabrice Bellard\n");
 
2631
}
 
2632
 
2627
2633
static void usage(void)
2628
2634
{
2629
 
    printf("qemu-" TARGET_ARCH " version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
2630
 
           "usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
 
2635
    version();
 
2636
    printf("usage: qemu-" TARGET_ARCH " [options] program [arguments...]\n"
2631
2637
           "Linux CPU emulator (compiled for %s emulation)\n"
2632
2638
           "\n"
2633
2639
           "Standard options:\n"
2634
2640
           "-h                print this help\n"
 
2641
           "-version          display version information and exit\n"
2635
2642
           "-g port           wait gdb connection to port\n"
2636
2643
           "-L path           set the elf interpreter prefix (default=%s)\n"
2637
2644
           "-s size           set the stack size in bytes (default=%ld)\n"
2886
2893
            singlestep = 1;
2887
2894
        } else if (!strcmp(r, "strace")) {
2888
2895
            do_strace = 1;
2889
 
        } else
2890
 
        {
 
2896
        } else if (!strcmp(r, "version")) {
 
2897
            version();
 
2898
            exit(0);
 
2899
        } else {
2891
2900
            usage();
2892
2901
        }
2893
2902
    }