From 7f143d77d1a04e16fc57110826957826712a8769 Mon Sep 17 00:00:00 2001 From: uz Date: Fri, 28 Aug 2009 10:23:19 +0000 Subject: [PATCH] Added -u as an alias for --force-import. Updated command line option infos in the cl65 and ld65 docs. git-svn-id: svn://svn.cc65.org/cc65/trunk@4061 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- doc/cl65.sgml | 2 ++ doc/ld65.sgml | 33 +++++++++++++++++---------------- src/cl65/main.c | 11 +++++++++-- src/ld65/main.c | 17 +++++++++++------ 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/doc/cl65.sgml b/doc/cl65.sgml index 42eacee3a..484c6e966 100644 --- a/doc/cl65.sgml +++ b/doc/cl65.sgml @@ -44,6 +44,7 @@ Short options: -o name Name the output file -r Enable register variables -t sys Set the target system + -u sym Force an import of symbol `sym' -v Verbose mode -vm Verbose map file -C name Use linker config file @@ -83,6 +84,7 @@ Long options: --debug Debug mode --debug-info Add debug info --feature name Set an emulation feature + --force-import sym Force an import of symbol `sym' --forget-inc-paths Forget include search paths (compiler) --help Help (this text) --include-dir dir Set a compiler include directory path diff --git a/doc/ld65.sgml b/doc/ld65.sgml index 27723cd59..80cfd4421 100644 --- a/doc/ld65.sgml +++ b/doc/ld65.sgml @@ -67,6 +67,7 @@ Short options: -m name Create a map file -o name Name the default output file -t sys Set the target system + -u sym Force an import of symbol `sym' -v Verbose mode -vm Verbose map file @@ -175,6 +176,22 @@ Here is a description of all the command line options: supported. + -u sym[:addrsize], --force-import sym[:addrsize] + + Force an import of a symbol. While object files are always linked to the + output file, regardless if there are any references, object modules from + libraries get only linked in if an import can be satisfied by this module. + The -v, --verbose @@ -264,22 +281,6 @@ Here is a description of all the command line options: file and it's contents are subject to change without further notice. - --force-import sym[:addrsize] - - Force an import of a symbol. While object files are always linked to the - output file, regardless if there are any references, object modules from - libraries get only linked in if an import can be satisfied by this module. - The --lib file Links a library to the output. Use this command line option instead of just diff --git a/src/cl65/main.c b/src/cl65/main.c index a00cf745e..78dcea63f 100644 --- a/src/cl65/main.c +++ b/src/cl65/main.c @@ -636,6 +636,7 @@ static void Usage (void) " -o name\t\tName the output file\n" " -r\t\t\tEnable register variables\n" " -t sys\t\tSet the target system\n" + " -u sym\t\tForce an import of symbol `sym'\n" " -v\t\t\tVerbose mode\n" " -vm\t\t\tVerbose map file\n" " -C name\t\tUse linker config file\n" @@ -675,6 +676,7 @@ static void Usage (void) " --debug\t\tDebug mode\n" " --debug-info\t\tAdd debug info\n" " --feature name\tSet an emulation feature\n" + " --force-import sym\tForce an import of symbol `sym'\n" " --forget-inc-paths\tForget include search paths (compiler)\n" " --help\t\tHelp (this text)\n" " --include-dir dir\tSet a compiler include directory path\n" @@ -880,8 +882,8 @@ static void OptFeature (const char* Opt attribute ((unused)), const char* Arg) static void OptForceImport (const char* Opt attribute ((unused)), const char* Arg) /* Emulation features for the assembler */ { - CmdAddArg2 (&LD65, "--force-import", Arg); -} + CmdAddArg2 (&LD65, "-u", Arg); +} @@ -1358,6 +1360,11 @@ int main (int argc, char* argv []) OptTarget (Arg, GetArg (&I, 2)); break; + case 'u': + /* Force an import (linker) */ + OptForceImport (Arg, GetArg (&I, 2)); + break; + case 'v': if (Arg [2] == 'm') { /* Verbose map file (linker) */ diff --git a/src/ld65/main.c b/src/ld65/main.c index 7821cdd7b..0567e4bd9 100644 --- a/src/ld65/main.c +++ b/src/ld65/main.c @@ -105,6 +105,7 @@ static void Usage (void) " -m name\t\tCreate a map file\n" " -o name\t\tName the default output file\n" " -t sys\t\tSet the target system\n" + " -u sym\t\tForce an import of symbol `sym'\n" " -v\t\t\tVerbose mode\n" " -vm\t\t\tVerbose map file\n" "\n" @@ -353,7 +354,7 @@ static void OptForceImport (const char* Opt attribute ((unused)), const char* Ar if (ColPos == 0) { /* Use default address size (which for now is always absolute - * addressing) + * addressing) */ InsertImport (GenImport (Arg, ADDR_SIZE_ABS)); @@ -572,16 +573,20 @@ int main (int argc, char* argv []) case 't': if (CfgAvail ()) { - Error ("Cannot use -C/-t twice"); + Error ("Cannot use -C/-t twice"); } OptTarget (Arg, GetArg (&I, 2)); break; + case 'u': + OptForceImport (Arg, GetArg (&I, 2)); + break; + case 'v': switch (Arg [2]) { case 'm': VerboseMap = 1; break; - case '\0': ++Verbosity; break; - default: UnknownOption (Arg); + case '\0': ++Verbosity; break; + default: UnknownOption (Arg); } break; @@ -596,8 +601,8 @@ int main (int argc, char* argv []) case 'L': switch (Arg [2]) { /* ## The first one is obsolete and will go */ - case 'n': LabelFileName = GetArg (&I, 3); break; - default: OptLibPath (Arg, GetArg (&I, 2)); break; + case 'n': LabelFileName = GetArg (&I, 3); break; + default: OptLibPath (Arg, GetArg (&I, 2)); break; } break; -- 2.39.5