diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2020-11-26 17:27:07 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2020-11-26 17:27:07 +0000 |
| commit | 2e4772e82335c32e07d0605e5edefb0ac6ea857b (patch) | |
| tree | d7a054971d1ea18056d0ddb9e0bf0aeb93fb274f /gen | |
| parent | 907a6834f73ccf2839853eb67a29726275ed04b4 (diff) | |
Notes
Diffstat (limited to 'gen')
| -rw-r--r-- | gen/lib.bc | 2 | ||||
| -rw-r--r-- | gen/strgen.c | 21 | ||||
| -rwxr-xr-x | gen/strgen.sh | 6 |
3 files changed, 17 insertions, 12 deletions
diff --git a/gen/lib.bc b/gen/lib.bc index 93ac29546beb9..7768eb74bad1e 100644 --- a/gen/lib.bc +++ b/gen/lib.bc @@ -173,7 +173,7 @@ define a(x){ return((m*a+r)/n) } define j(n,x){ - auto b,s,o,a,i,v,f + auto b,s,o,a,i,r,v,f b=ibase ibase=A s=scale diff --git a/gen/strgen.c b/gen/strgen.c index f4c4b51d1248d..0b23061528742 100644 --- a/gen/strgen.c +++ b/gen/strgen.c @@ -45,13 +45,14 @@ static const char* const bc_gen_header = "// Copyright (c) 2018-2020 Gavin D. Howard and contributors.\n" "// Licensed under the 2-clause BSD license.\n" - "// *** AUTOMATICALLY GENERATED FROM %s. DO NOT MODIFY. ***\n"; + "// *** AUTOMATICALLY GENERATED FROM %s. DO NOT MODIFY. ***\n\n"; -static const char* const bc_gen_include = "#include <%s>\n\n"; static const char* const bc_gen_label = "const char *%s = \"%s\";\n\n"; +static const char* const bc_gen_label_extern = "extern const char *%s;\n\n"; static const char* const bc_gen_ifdef = "#if %s\n"; static const char* const bc_gen_endif = "#endif // %s\n"; static const char* const bc_gen_name = "const char %s[] = {\n"; +static const char* const bc_gen_name_extern = "extern const char %s[];\n\n"; #define IO_ERR (1) #define INVALID_INPUT_FILE (2) @@ -62,7 +63,7 @@ static const char* const bc_gen_name = "const char %s[] = {\n"; int main(int argc, char *argv[]) { FILE *in, *out; - char *label, *define, *name, *include; + char *label, *define, *name; int c, count, slashes, err = IO_ERR; bool has_label, has_define, remove_tabs; @@ -72,15 +73,14 @@ int main(int argc, char *argv[]) { } name = argv[3]; - include = argv[4]; - has_label = (argc > 5 && strcmp("", argv[5]) != 0); - label = has_label ? argv[5] : ""; + has_label = (argc > 4 && strcmp("", argv[4]) != 0); + label = has_label ? argv[4] : ""; - has_define = (argc > 6 && strcmp("", argv[6]) != 0); - define = has_define ? argv[6] : ""; + has_define = (argc > 5 && strcmp("", argv[5]) != 0); + define = has_define ? argv[5] : ""; - remove_tabs = (argc > 7); + remove_tabs = (argc > 6); in = fopen(argv[1], "r"); if (!in) return INVALID_INPUT_FILE; @@ -89,8 +89,9 @@ int main(int argc, char *argv[]) { if (!out) goto out_err; if (fprintf(out, bc_gen_header, argv[1]) < 0) goto err; + if (has_label && fprintf(out, bc_gen_label_extern, label) < 0) goto err; + if (fprintf(out, bc_gen_name_extern, name) < 0) goto err; if (has_define && fprintf(out, bc_gen_ifdef, define) < 0) goto err; - if (fprintf(out, bc_gen_include, include) < 0) goto err; if (has_label && fprintf(out, bc_gen_label, label, argv[1]) < 0) goto err; if (fprintf(out, bc_gen_name, name) < 0) goto err; diff --git a/gen/strgen.sh b/gen/strgen.sh index f389c12c05790..53acece8c06c6 100755 --- a/gen/strgen.sh +++ b/gen/strgen.sh @@ -50,6 +50,7 @@ exec > "$output" if [ -n "$label" ]; then nameline="const char *${label} = \"${input}\";" + labelexternline="extern const char *${label};" fi if [ -n "$define" ]; then @@ -64,11 +65,14 @@ if [ -n "$remove_tabs" ]; then fi cat<<EOF +// Copyright (c) 2018-2020 Gavin D. Howard and contributors. // Licensed under the 2-clause BSD license. // *** AUTOMATICALLY GENERATED FROM ${input}. DO NOT MODIFY. *** ${condstart} -#include <${header}> +$labelexternline + +extern const char $name[]; $nameline |