diff --git a/contrib/bash_compl/_rgblink.bash b/contrib/bash_compl/_rgblink.bash index ec9446d5..41af5d9c 100755 --- a/contrib/bash_compl/_rgblink.bash +++ b/contrib/bash_compl/_rgblink.bash @@ -20,7 +20,6 @@ _rgblink_completions() { [O]="overlay:glob-*.gb *.gbc *.sgb" [o]="output:glob-*.gb *.gbc *.sgb" [p]="pad:unk" - [s]="smart:unk" ) # Parse command-line up to current word local opt_ena=true diff --git a/contrib/zsh_compl/_rgblink b/contrib/zsh_compl/_rgblink index 35f30a17..3e9ca6be 100644 --- a/contrib/zsh_compl/_rgblink +++ b/contrib/zsh_compl/_rgblink @@ -18,7 +18,6 @@ local args=( '(-o --output)'{-o,--output}"+[Write ROM image to this file]:rom file:_files -g '*.{gb,sgb,gbc}'" '(-p --pad-value)'{-p,--pad-value}'+[Set padding byte]:padding byte:' '(-S --scramble)'{-s,--scramble}'+[Activate scrambling]:scramble spec' - '(-s --smart)'{-s,--smart}'+[!BROKEN! Perform smart linking from this symbol]:symbol name:' '*'":object files:_files -g '*.o'" ) diff --git a/man/rgblink.1 b/man/rgblink.1 index b8ada448..69f484f2 100644 --- a/man/rgblink.1 +++ b/man/rgblink.1 @@ -16,7 +16,6 @@ .Op Fl o Ar out_file .Op Fl p Ar pad_value .Op Fl S Ar spec -.Op Fl s Ar symbol .Ar .Sh DESCRIPTION The @@ -106,10 +105,6 @@ See .Sx Scrambling algorithm below for an explanation and a description of .Ar spec . -.It Fl s Ar symbol , Fl \-smart Ar symbol -This option is ignored. -It was supposed to perform smart linking but fell into disrepair, and so has been removed. -It will be reimplemented at some point. .It Fl t , Fl \-tiny Expand the ROM0 section size from 16 KiB to the full 32 KiB assigned to ROM. ROMX sections that are fixed to a bank other than 1 become errors, other ROMX sections are treated as ROM0. diff --git a/src/link/main.cpp b/src/link/main.cpp index a6217cea..36df692c 100644 --- a/src/link/main.cpp +++ b/src/link/main.cpp @@ -149,7 +149,7 @@ void argErr(char flag, char const *fmt, ...) { } // Short options -static char const *optstring = "dl:m:Mn:O:o:p:S:s:tVvWwx"; +static char const *optstring = "dl:m:Mn:O:o:p:S:tVvWwx"; /* * Equivalent long options @@ -171,7 +171,6 @@ static option const longopts[] = { {"output", required_argument, nullptr, 'o'}, {"pad", required_argument, nullptr, 'p'}, {"scramble", required_argument, nullptr, 'S'}, - {"smart", required_argument, nullptr, 's'}, {"tiny", no_argument, nullptr, 't'}, {"version", no_argument, nullptr, 'V'}, {"verbose", no_argument, nullptr, 'v'}, @@ -184,7 +183,7 @@ static void printUsage() { fputs( "Usage: rgblink [-dMtVvwx] [-l script] [-m map_file] [-n sym_file]\n" " [-O overlay_file] [-o out_file] [-p pad_value]\n" - " [-S spec] [-s symbol] ...\n" + " [-S spec] ...\n" "Useful options:\n" " -l, --linkerscript set the input linker script\n" " -m, --map set the output map file\n" @@ -393,10 +392,6 @@ int main(int argc, char *argv[]) { case 'S': parseScrambleSpec(musl_optarg); break; - case 's': - // TODO: implement "smart linking" with `-s` - warning(nullptr, 0, "Nobody has any idea what `-s` does"); - break; case 't': is32kMode = true; break;