None of them is referenced by the Makefile, the release targets or the documentation: - gdb_files only echoed ${GDB_FILES} ${GDB_PATCH_FILES}, which is empty apart from the patch file now that gdb ships as a tarball; "make files" already prints the complete tarball file list - glink linked ${GDB}/gdb into the crash root, but crash's gdb patch redirects gdb's link output to ../../crash, so there is no gdb binary for it to reach - name only echoed ${PROGRAM} - ref only ran "make ctags cscope" The embedded gdb's files and patch file remain in the "make files" output, because show_files prints ${GDB_FILES} ${GDB_PATCH_FILES} itself. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- Makefile | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 46c43a42dbae..c392c23b7327 100644 --- a/Makefile +++ b/Makefile @@ -622,10 +622,12 @@ files: make_configure @./configure -q -b @$(MAKE) show_files -gdb_files: make_configure - @./configure -q -b - @echo ${GDB_FILES} ${GDB_PATCH_FILES} - +# +# The list of files which make up a release tarball. The embedded gdb's +# files and its patch file(s) are included through GDB_FILES and +# GDB_PATCH_FILES, which is why "make files" still lists them even though +# there is no separate gdb_files target. +# show_files: @if [ -f ${PROGRAM} ]; then \ ./${PROGRAM} --no_scroll --no_crashrc -h README > README; fi @@ -701,24 +703,12 @@ do_release: ls -l ${PROGRAM}-${VERSION}-${RELEASE}.src.rpm; \ fi -ref: - $(MAKE) ctags cscope - cscope: rm -f cscope.files cscope.out for FILE in ${SOURCE_FILES}; do \ echo $$FILE >> cscope.files; done cscope -b -f cscope.out -glink: make_configure - @./configure -q -b - rm -f gdb - ln -s ${GDB}/gdb gdb - (cd ${GDB}/gdb; rm -f ${PROGRAM}; ln -s ../../${PROGRAM} ${PROGRAM}) - -name: - @echo ${PROGRAM} - dis: objdump --disassemble --line-numbers ${PROGRAM} > ${PROGRAM}.dis -- 2.51.1

crash is a line-oriented tool and never uses gdb's full-screen terminal user interface. Pass --disable-tui so that the TUI sources (16 files) are not built into crash. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ae29ea5b5737..2c7573d1c8a9 100644 --- a/Makefile +++ b/Makefile @@ -326,7 +326,8 @@ gdb_merge: force @rm -f ${PROGRAM} @if [ ! -f ${GDB}/config.status ]; then \ (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \ - --with-bugurl="" --with-expat=no --with-python=no --disable-sim; \ + --with-bugurl="" --with-expat=no --with-python=no --disable-sim \ + --disable-tui; \ $(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ else $(MAKE) rebuild; fi @if [ ! -f ${PROGRAM} ]; then \ -- 2.51.1

configure.c substituted the build variables directly in the top-level Makefile, so that tracked file was modified by every build. Write them to a generated Makefile.inc instead, which the Makefile includes after its own defaults; removing that file returns the build to its unconfigured state. - config_read()/config_write() replace makefile_setup()/makefile_create() and the five line-oriented substitution loops. The 13 managed variables are emitted directly as complete NAME=value lines, so a mode which runs later in the same configure invocation keeps what an earlier one set. - unconfigure() (-u) is now just the removal of Makefile.inc, and set_warnings() only reads the commented warning defaults out of the Makefile. - distclean removes the generated configure files, every extracted gdb source tree (which takes all of the embedded gdb object files with it) and the release tarball, spec and source RPM. - drop the -u from the release spec step so that the release variables stay defined for the separate spec build that follows. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- .gitignore | 2 + Makefile | 24 +++- configure.c | 408 ++++++++++++++++++++++++++-------------------------- 3 files changed, 232 insertions(+), 202 deletions(-) diff --git a/.gitignore b/.gitignore index 6b8bd6dd3cae..7ac5de1797d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ configure build_data.c +Makefile.inc +Makefile.inc.new cscope.out crashlib.a *.o diff --git a/Makefile b/Makefile index 71d4be4459b1..70dc880eeb8e 100644 --- a/Makefile +++ b/Makefile @@ -387,6 +387,20 @@ do_clean: @$(MAKE) -C extensions -i clean @$(MAKE) -C memory_driver -i clean +# +# Remove everything a build creates: the objects and binaries handled by +# "clean", the generated configure override file, the files generated by +# crash's configure, every extracted gdb source tree (which takes all of +# the embedded gdb object files with it), and the release tarball, spec +# and source RPM. +# +distclean: clean + @$(MAKE) do_distclean + +do_distclean: + rm -rf ${GDB} gdb-*/ gdb.files build_data.c configure Makefile.inc Makefile.inc.new + rm -f ${PROGRAM}-*.tar.gz ${PROGRAM}.spec ${PROGRAM}-*.src.rpm + build_data.o: force ${CC} -c ${CRASH_CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR} @@ -667,6 +681,14 @@ do_tar: VERSION= RELEASE=0 +# +# Configure writes the variables it manages to Makefile.inc, which is +# included here so that the generated values override the defaults above. +# Removing that file returns the build to its unconfigured state; +# "make unconfig" and "make distclean" do that for you. +# +-include Makefile.inc + release: make_configure @if [ "`id --user`" != "0" ]; then \ echo "make release: must be super-user"; exit 1; fi @@ -705,7 +727,7 @@ do_release: @rm -rf ./RELDIR @echo @ls -l ${PROGRAM}-${VERSION}.tar.gz - @./configure -s -u > ${PROGRAM}.spec + @./configure -s > ${PROGRAM}.spec @if [ -s ${PROGRAM}.spec ]; then \ rm -rf ./RPMBUILD; \ mkdir -p ./RPMBUILD/SOURCES ./RPMBUILD/SPECS ./RPMBUILD/SRPMS; \ diff --git a/configure.c b/configure.c index fd7b533cb66e..615fdddd32c5 100644 --- a/configure.c +++ b/configure.c @@ -67,8 +67,32 @@ void show_configuration(void); void target_rebuild_instructions(struct supported_gdb_version *, char *); void arch_mismatch(struct supported_gdb_version *); void get_current_configuration(struct supported_gdb_version *); -void makefile_setup(FILE **, FILE **); -void makefile_create(FILE **, FILE **); +/* + * configure does not modify the top-level Makefile. It writes the + * variables it manages to Makefile.inc as complete "NAME=value" lines; + * the Makefile includes that file after its own defaults, so a build can + * be unconfigured by simply removing the generated file. + */ +#define CONFIG_OVERRIDE "Makefile.inc" +#define CONFIG_STRING_SIZE 1024 + +struct configure_config { + char target[CONFIG_STRING_SIZE]; + char target_cflags[CONFIG_STRING_SIZE]; + char gdb_conf_flags[CONFIG_STRING_SIZE]; + char ldflags[CONFIG_STRING_SIZE]; + char gdb[CONFIG_STRING_SIZE]; + char gdb_files[CONFIG_STRING_SIZE]; + char gdb_ofiles[CONFIG_STRING_SIZE]; + char gdb_patch_files[CONFIG_STRING_SIZE]; + char gdb_flags[CONFIG_STRING_SIZE]; + char gpl_files[CONFIG_STRING_SIZE]; + char version[CONFIG_STRING_SIZE]; + char warning_options[CONFIG_STRING_SIZE]; + char warning_error[CONFIG_STRING_SIZE]; +}; +void config_read(struct configure_config *); +void config_write(struct configure_config *); char *strip_linefeeds(char *); char *upper_case(char *, char *); char *lower_case(char *, char *); @@ -730,13 +754,12 @@ show_configuration(void) void build_configure(struct supported_gdb_version *sp) { - FILE *fp1, *fp2; - char buf[512]; char *target; char *target_CFLAGS; char *gdb_conf_flags; char *ldflags; char *cflags; + struct configure_config config; get_current_configuration(sp); @@ -849,40 +872,24 @@ build_configure(struct supported_gdb_version *sp) cflags = get_extra_flags("CFLAGS.extra", NULL); gdb_conf_flags = get_extra_flags("GDBFLAGS.extra", gdb_conf_flags); - makefile_setup(&fp1, &fp2); + config_read(&config); - while (fgets(buf, 512, fp1)) { - if (strncmp(buf, "TARGET=", strlen("TARGET=")) == 0) - fprintf(fp2, "%s\n", target); - else if (strncmp(buf, "TARGET_CFLAGS=", - strlen("TARGET_CFLAGS=")) == 0) - fprintf(fp2, "%s%s%s\n", target_CFLAGS, - cflags ? " " : "", cflags ? cflags : ""); - else if (strncmp(buf, "GDB_CONF_FLAGS=", - strlen("GDB_CONF_FLAGS=")) == 0) - fprintf(fp2, "%s\n", gdb_conf_flags); - else if (strncmp(buf, "GDB_FILES=",strlen("GDB_FILES=")) == 0) - fprintf(fp2, "%s\n", sp->GDB_FILES); - else if (strncmp(buf, "GDB_OFILES=",strlen("GDB_OFILES=")) == 0) - fprintf(fp2, "%s\n", sp->GDB_OFILES); - else if (strncmp(buf, "GDB_PATCH_FILES=",strlen("GDB_PATCH_FILES=")) == 0) - fprintf(fp2, "%s\n", sp->GDB_PATCH_FILES); - else if (strncmp(buf, "GDB_FLAGS=",strlen("GDB_FLAGS=")) == 0) - fprintf(fp2, "%s\n", sp->GDB_FLAGS); - else if (strncmp(buf, "GPL_FILES=", strlen("GPL_FILES=")) == 0) - fprintf(fp2, "GPL_FILES=%s\n", strcmp(sp->GPL, "GPLv2") == 0 ? - "COPYING" : "COPYING3"); - else if (strncmp(buf, "GDB=", strlen("GDB=")) == 0) { - fprintf(fp2, "%s\n", sp->GDB); - sprintf(target_data.gdb_version, "%s", &sp->GDB[4]); - } else if (strncmp(buf, "LDFLAGS=", strlen("LDFLAGS=")) == 0) { - fprintf(fp2, "LDFLAGS=%s\n", ldflags ? ldflags : ""); - } else - fprintf(fp2, "%s", buf); + sprintf(config.target, "%s", target); + sprintf(config.target_cflags, "%s%s%s", target_CFLAGS, + cflags ? " " : "", cflags ? cflags : ""); + sprintf(config.gdb_conf_flags, "%s", gdb_conf_flags); + sprintf(config.gdb_files, "%s", sp->GDB_FILES); + sprintf(config.gdb_ofiles, "%s", sp->GDB_OFILES); + sprintf(config.gdb_patch_files, "%s", sp->GDB_PATCH_FILES); + sprintf(config.gdb_flags, "%s", sp->GDB_FLAGS); + sprintf(config.gpl_files, "GPL_FILES=%s", + strcmp(sp->GPL, "GPLv2") == 0 ? "COPYING" : "COPYING3"); + sprintf(config.gdb, "%s", sp->GDB); + sprintf(config.ldflags, "LDFLAGS=%s", ldflags ? ldflags : ""); - } + config_write(&config); - makefile_create(&fp1, &fp2); + sprintf(target_data.gdb_version, "%s", &sp->GDB[4]); show_configuration(); make_build_data(&target[strlen("TARGET=")]); } @@ -890,10 +897,11 @@ build_configure(struct supported_gdb_version *sp) void release_configure(char *gdb_version, struct supported_gdb_version *sp) { - FILE *fp1, *fp2; + FILE *fp; int found; char buf[512]; char gdb_files[MAXSTRLEN]; + struct configure_config config; get_current_configuration(sp); @@ -905,25 +913,19 @@ release_configure(char *gdb_version, struct supported_gdb_version *sp) sprintf(gdb_files, "GDB_%s_FILES", &gdb_version[strlen("gdb-")]); - makefile_setup(&fp1, &fp2); - + /* + * The Makefile must define the GDB_<version>_FILES variable that + * GDB_FILES is set to. + */ found = 0; - while (fgets(buf, 512, fp1)) { - if (strncmp(buf, gdb_files, strlen(gdb_files)) == 0) - found++; - if (strncmp(buf, "GDB_FILES=", strlen("GDB_FILES=")) == 0) - fprintf(fp2, "GDB_FILES=${%s}\n", gdb_files); - else if (strncmp(buf, "VERSION=", strlen("VERSION=")) == 0) - fprintf(fp2, "VERSION=%s\n", - target_data.release); - else if (strncmp(buf, "GDB_PATCH_FILES=", strlen("GDB_PATCH_FILES=")) == 0) - fprintf(fp2, "%s\n", sp->GDB_PATCH_FILES); - else if (strncmp(buf, "GPL_FILES=", strlen("GPL_FILES=")) == 0) - fprintf(fp2, "GPL_FILES=%s\n", strcmp(sp->GPL, "GPLv2") == 0 ? - "COPYING" : "COPYING3"); - else - fprintf(fp2, "%s", buf); - + if ((fp = fopen("Makefile", "r")) != NULL) { + while (fgets(buf, 512, fp)) { + if (strncmp(buf, gdb_files, strlen(gdb_files)) == 0) { + found++; + break; + } + } + fclose(fp); } if (!found) { @@ -931,7 +933,13 @@ release_configure(char *gdb_version, struct supported_gdb_version *sp) exit(1); } - makefile_create(&fp1, &fp2); + config_read(&config); + sprintf(config.gdb_files, "GDB_FILES=${%s}", gdb_files); + sprintf(config.version, "VERSION=%s", target_data.release); + sprintf(config.gdb_patch_files, "%s", sp->GDB_PATCH_FILES); + sprintf(config.gpl_files, "GPL_FILES=%s", + strcmp(sp->GPL, "GPLv2") == 0 ? "COPYING" : "COPYING3"); + config_write(&config); } /* @@ -1003,182 +1011,180 @@ make_crash_release(char *package, int release) void gdb_configure(struct supported_gdb_version *sp) { - FILE *fp1, *fp2; - char buf[512]; + struct configure_config config; get_current_configuration(sp); - makefile_setup(&fp1, &fp2); - - while (fgets(buf, 512, fp1)) { - if (strncmp(buf, "GDB=", strlen("GDB=")) == 0) - fprintf(fp2, "%s\n", sp->GDB); - else - fprintf(fp2, "%s", buf); - - } - - makefile_create(&fp1, &fp2); + config_read(&config); + sprintf(config.gdb, "%s", sp->GDB); + config_write(&config); } void unconfigure(void) { - FILE *fp1, *fp2; - char buf[512]; - - makefile_setup(&fp1, &fp2); - - while (fgets(buf, 512, fp1)) { - if (strncmp(buf, "TARGET=", strlen("TARGET=")) == 0) - fprintf(fp2, "TARGET=\n"); - else if (strncmp(buf, "TARGET_CFLAGS=", - strlen("TARGET_CFLAGS=")) == 0) - fprintf(fp2, "TARGET_CFLAGS=\n"); - else if (strncmp(buf, "GDB_CONF_FLAGS=", - strlen("GDB_CONF_FLAGS=")) == 0) - fprintf(fp2, "GDB_CONF_FLAGS=\n"); - else if (strncmp(buf, "GDB_FILES=",strlen("GDB_FILES=")) == 0) - fprintf(fp2, "GDB_FILES=\n"); - else if (strncmp(buf, "GDB_OFILES=",strlen("GDB_OFILES=")) == 0) - fprintf(fp2, "GDB_OFILES=\n"); - else if (strncmp(buf, "GDB_PATCH_FILES=",strlen("GDB_PATCH_FILES=")) == 0) - fprintf(fp2, "GDB_PATCH_FILES=\n"); - else if (strncmp(buf, "GDB_FLAGS=",strlen("GDB_FLAGS=")) == 0) - fprintf(fp2, "GDB_FLAGS=\n"); - else if (strncmp(buf, "GDB=", strlen("GDB=")) == 0) - fprintf(fp2, "GDB=\n"); - else if (strncmp(buf, "VERSION=", strlen("VERSION=")) == 0) - fprintf(fp2, "VERSION=\n"); - else if (strncmp(buf, "GPL_FILES=", strlen("GPL_FILES=")) == 0) - fprintf(fp2, "GPL_FILES=\n"); - else if (strncmp(buf, "LDFLAGS=", strlen("LDFLAGS=")) == 0) - fprintf(fp2, "LDFLAGS=\n"); - else if (strncmp(buf, "WARNING_ERROR=", - strlen("WARNING_ERROR=")) == 0) { - shift_string_right(buf, 1); - buf[0] = '#'; - fprintf(fp2, "%s", buf); - } else if (strncmp(buf, "WARNING_OPTIONS=", - strlen("WARNING_OPTIONS=")) == 0) { - shift_string_right(buf, 1); - buf[0] = '#'; - fprintf(fp2, "%s", buf); - } else - fprintf(fp2, "%s", buf); - } - - makefile_create(&fp1, &fp2); + /* + * Removing the generated override file returns the build to its + * distributed, unconfigured state. + */ + if (file_exists(CONFIG_OVERRIDE) && unlink(CONFIG_OVERRIDE) != 0) + perror(CONFIG_OVERRIDE); } void set_warnings(int w) { - FILE *fp1, *fp2; - char buf[512]; - - makefile_setup(&fp1, &fp2); - - while (fgets(buf, 512, fp1)) { - if (strncmp(buf, "#WARNING_ERROR=", - strlen("#WARNING_ERROR=")) == 0) { - switch (w) - { - case 'W': - shift_string_left(buf, 1); - break; - case 'w': - case 'n': - break; - } - } + FILE *fp; + char buf[512]; + char options[CONFIG_STRING_SIZE - sizeof("WARNING_OPTIONS=")]; + char error[CONFIG_STRING_SIZE - sizeof("WARNING_ERROR=")]; + struct configure_config config; - if (strncmp(buf, "WARNING_ERROR=", - strlen("WARNING_ERROR=")) == 0) { - switch (w) - { - case 'n': - case 'w': - shift_string_right(buf, 1); - buf[0] = '#'; - break; - case 'W': - break; - } - } - - if (strncmp(buf, "#WARNING_OPTIONS=", - strlen("#WARNING_OPTIONS=")) == 0) { - switch (w) - { - case 'W': - case 'w': - shift_string_left(buf, 1); - break; - case 'n': - break; - } + /* + * The warning flags are maintained as commented-out defaults in the + * Makefile; activate as many of them as requested. + */ + options[0] = '\0'; + error[0] = '\0'; + if ((fp = fopen("Makefile", "r")) != NULL) { + while (fgets(buf, 512, fp)) { + strip_linefeeds(buf); + if (strncmp(buf, "#WARNING_OPTIONS=", + strlen("#WARNING_OPTIONS=")) == 0) + sprintf(options, "%s", + &buf[strlen("#WARNING_OPTIONS=")]); + else if (strncmp(buf, "#WARNING_ERROR=", + strlen("#WARNING_ERROR=")) == 0) + sprintf(error, "%s", + &buf[strlen("#WARNING_ERROR=")]); } + fclose(fp); + } - if (strncmp(buf, "WARNING_OPTIONS=", - strlen("WARNING_OPTIONS=")) == 0) { - switch (w) - { - case 'w': - case 'W': - break; - case 'n': - shift_string_right(buf, 1); - buf[0] = '#'; - break; - } - } + config_read(&config); - fprintf(fp2, "%s", buf); - } + switch (w) + { + case 'W': + sprintf(config.warning_options, "WARNING_OPTIONS=%s", options); + sprintf(config.warning_error, "WARNING_ERROR=%s", error); + break; + case 'w': + sprintf(config.warning_options, "WARNING_OPTIONS=%s", options); + sprintf(config.warning_error, "WARNING_ERROR="); + break; + case 'n': + default: + sprintf(config.warning_options, "WARNING_OPTIONS="); + sprintf(config.warning_error, "WARNING_ERROR="); + break; + } - makefile_create(&fp1, &fp2); + config_write(&config); } +/* + * Read the current override file, if any, so that a mode only has to + * change the variables it is responsible for. Every field is kept as a + * complete "NAME=value" line so that clearing a value keeps its name. + */ void -makefile_setup(FILE **fp1, FILE **fp2) +config_read(struct configure_config *config) { - if (stat("Makefile", &target_data.statbuf) == -1) { - perror("Makefile"); - exit(1); - } + FILE *fp; + char buf[CONFIG_STRING_SIZE]; + + sprintf(config->target, "TARGET="); + sprintf(config->target_cflags, "TARGET_CFLAGS="); + sprintf(config->gdb_conf_flags, "GDB_CONF_FLAGS="); + sprintf(config->ldflags, "LDFLAGS="); + sprintf(config->gdb, "GDB="); + sprintf(config->gdb_files, "GDB_FILES="); + sprintf(config->gdb_ofiles, "GDB_OFILES="); + sprintf(config->gdb_patch_files, "GDB_PATCH_FILES="); + sprintf(config->gdb_flags, "GDB_FLAGS="); + sprintf(config->gpl_files, "GPL_FILES="); + sprintf(config->version, "VERSION="); + sprintf(config->warning_options, "WARNING_OPTIONS="); + sprintf(config->warning_error, "WARNING_ERROR="); + + if ((fp = fopen(CONFIG_OVERRIDE, "r")) == NULL) + return; - if ((*fp1 = fopen("Makefile", "r")) == NULL) { - perror("fopen"); - fprintf(stderr, "cannot open existing Makefile\n"); - exit(1); - } + while (fgets(buf, sizeof(buf), fp)) { + strip_linefeeds(buf); + if (strncmp(buf, "TARGET=", strlen("TARGET=")) == 0) + sprintf(config->target, "%s", buf); + else if (strncmp(buf, "TARGET_CFLAGS=", + strlen("TARGET_CFLAGS=")) == 0) + sprintf(config->target_cflags, "%s", buf); + else if (strncmp(buf, "GDB_CONF_FLAGS=", + strlen("GDB_CONF_FLAGS=")) == 0) + sprintf(config->gdb_conf_flags, "%s", buf); + else if (strncmp(buf, "GDB_FILES=", strlen("GDB_FILES=")) == 0) + sprintf(config->gdb_files, "%s", buf); + else if (strncmp(buf, "GDB_OFILES=", strlen("GDB_OFILES=")) == 0) + sprintf(config->gdb_ofiles, "%s", buf); + else if (strncmp(buf, "GDB_PATCH_FILES=", + strlen("GDB_PATCH_FILES=")) == 0) + sprintf(config->gdb_patch_files, "%s", buf); + else if (strncmp(buf, "GDB_FLAGS=", strlen("GDB_FLAGS=")) == 0) + sprintf(config->gdb_flags, "%s", buf); + else if (strncmp(buf, "GPL_FILES=", strlen("GPL_FILES=")) == 0) + sprintf(config->gpl_files, "%s", buf); + else if (strncmp(buf, "GDB=", strlen("GDB=")) == 0) + sprintf(config->gdb, "%s", buf); + else if (strncmp(buf, "LDFLAGS=", strlen("LDFLAGS=")) == 0) + sprintf(config->ldflags, "%s", buf); + else if (strncmp(buf, "VERSION=", strlen("VERSION=")) == 0) + sprintf(config->version, "%s", buf); + else if (strncmp(buf, "WARNING_OPTIONS=", + strlen("WARNING_OPTIONS=")) == 0) + sprintf(config->warning_options, "%s", buf); + else if (strncmp(buf, "WARNING_ERROR=", + strlen("WARNING_ERROR=")) == 0) + sprintf(config->warning_error, "%s", buf); + } - unlink("Makefile.new"); - if ((*fp2 = fopen("Makefile.new", "w+")) == NULL) { - perror("fopen"); - fprintf(stderr, "cannot create new Makefile\n"); - exit(1); - } + fclose(fp); } +/* + * Write the complete override file, so that a mode which runs later in + * the same configure invocation sees the values set by an earlier one. + */ void -makefile_create(FILE **fp1, FILE **fp2) +config_write(struct configure_config *config) { - fclose(*fp1); - fclose(*fp2); + FILE *fp; + char tmp[CONFIG_STRING_SIZE]; - if (system("mv Makefile.new Makefile") != 0) { - fprintf(stderr, "Makefile: cannot create new Makefile\n"); - fprintf(stderr, "please copy Makefile.new to Makefile\n"); - exit(1); - } + sprintf(tmp, "%s.new", CONFIG_OVERRIDE); + if ((fp = fopen(tmp, "w")) == NULL) { + perror(tmp); + exit(1); + } - if (chown("Makefile", target_data.statbuf.st_uid, - target_data.statbuf.st_gid) == -1) { - fprintf(stderr, - "Makefile: cannot restore original owner/group\n"); - } + fprintf(fp, "%s\n", config->target); + fprintf(fp, "%s\n", config->target_cflags); + fprintf(fp, "%s\n", config->gdb_conf_flags); + fprintf(fp, "%s\n", config->ldflags); + fprintf(fp, "%s\n", config->gdb); + fprintf(fp, "%s\n", config->gdb_files); + fprintf(fp, "%s\n", config->gdb_ofiles); + fprintf(fp, "%s\n", config->gdb_patch_files); + fprintf(fp, "%s\n", config->gdb_flags); + fprintf(fp, "%s\n", config->gpl_files); + fprintf(fp, "%s\n", config->version); + fprintf(fp, "%s\n", config->warning_options); + fprintf(fp, "%s\n", config->warning_error); + + fclose(fp); + + if (rename(tmp, CONFIG_OVERRIDE) != 0) { + perror(CONFIG_OVERRIDE); + exit(1); + } } -- 2.51.1

"make tar" produced an unversioned, gdb-less crash.tar.gz alongside the versioned, gdb-bundled crash-<version>.tar.gz built by "make release", which is the artifact that gets shipped. TAR_FILES existed only for this target. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- Makefile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile b/Makefile index 1fb9a9817e42..37c3f6bf301a 100644 --- a/Makefile +++ b/Makefile @@ -272,8 +272,6 @@ export DEBUG CRASH_CFLAGS=$(DEBUG_CFLAGS) -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS} GPL_FILES= -TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README crash-release crash.8 \ - ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES} CSCOPE_FILES=${SOURCE_FILES} READLINE_DIRECTORY=./${GDB}/readline/readline @@ -668,16 +666,6 @@ show_files: ctags: ctags ${SOURCE_FILES} -tar: make_configure - @./configure -q -b - @$(MAKE) do_tar - -do_tar: - @if [ -f ${PROGRAM} ]; then \ - ./${PROGRAM} --no_scroll --no_crashrc -h README > README; fi - tar cvzf ${PROGRAM}.tar.gz ${TAR_FILES} ${GDB_FILES} ${GDB_PATCH_FILES} - @echo; ls -l ${PROGRAM}.tar.gz - VERSION= RELEASE=0 -- 2.51.1

Summarize the targets and options users need: building, cleaning, cross compiling, selecting the dumpfile architecture, debug info, the warning levels and the optional feature libraries, plus the packaging and helper targets. The target is placed after "all" so that the default goal is unchanged, and README now points at it. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README | 4 ++++ 2 files changed, 66 insertions(+) diff --git a/Makefile b/Makefile index b1d48b169489..3739bfa394a1 100644 --- a/Makefile +++ b/Makefile @@ -316,6 +316,68 @@ all: make_configure @$(MAKE) gdb_merge # @$(MAKE) extensions +# +# Summarize the targets and build options described in the README. +# +.PHONY: help +help: + @echo 'Usage: make [target] [option=value ...]' + @echo '' + @echo 'Build targets:' + @echo ' (default) build crash and the embedded gdb for this host' + @echo ' extensions build the extension modules (extensions/)' + @echo ' memory_driver build the memory driver module (memory_driver/)' + @echo ' gdb rebuild the gdb objects crash adds, then relink' + @echo ' install install the crash binary under DESTDIR (default /usr/bin)' + @echo '' + @echo 'Cleanup targets:' + @echo ' clean remove crash objects, crashlib.a and the crash binary;' + @echo ' the configured gdb directory is kept' + @echo ' distclean remove everything a build creates, including the' + @echo ' extracted gdb tree, Makefile.inc, configure,' + @echo ' build_data.c and the release tarball/spec/source RPM' + @echo ' unconfig remove the generated Makefile.inc, i.e. unconfigure' + @echo '' + @echo 'Build options:' + @echo ' target=<arch> build crash to analyze dumpfiles of another' + @echo ' architecture (default: this host). Cross targets' + @echo ' are limited to these host/target= combinations:' + @echo ' X86_64 -> X86 ARM ARM64 MIPS PPC64 RISCV64' + @echo ' LOONGARCH64' + @echo ' X86 -> ARM MIPS' + @echo ' PPC64 -> PPC' + @echo ' other -> native only; ALPHA, S390, S390X,' + @echo ' SPARC64, MIPS64 and IA64 must be' + @echo ' built on that host' + @echo ' CROSS_COMPILE=<pfx> cross compile the crash binary itself, for example' + @echo ' make CROSS_COMPILE=aarch64-linux-gnu- -j$$(nproc)' + @echo ' DEBUG=1 build crash and the embedded gdb with debug info (-g)' + @echo ' warn enable the #WARNING_OPTIONS flags from the Makefile' + @echo ' Warn as warn, plus -Werror (note the capital W)' + @echo ' nowarn use neither; the choice is remembered' + @echo ' lzo add support for LZO-compressed dumpfiles' + @echo ' snappy add support for snappy-compressed dumpfiles' + @echo ' zstd add support for zstd-compressed dumpfiles' + @echo ' valgrind build crash for valgrind memcheck' + @echo '' + @echo 'Packaging targets (normally run as root):' + @echo ' release create the source tarball crash-<version>.tar.gz' + @echo ' srpm create crash.spec and the source RPM from that tarball' + @echo ' files print the tarball file list' + @echo '' + @echo 'Other targets:' + @echo ' ctags build the ctags reference' + @echo ' cscope build the cscope reference' + @echo ' dis write a disassembly of the crash binary to crash.dis' + @echo '' + @echo 'Notes:' + @echo ' - Build in parallel, for example: make -j$$(nproc)' + @echo ' - The embedded gdb takes most of the build time; keeping its configured' + @echo ' directory (plain "make clean") avoids rebuilding it.' + @echo ' - Changing target=, DEBUG=1 or a feature option needs make clean (or' + @echo ' make distclean) first, since make cannot see that -D or -g changed.' + @echo ' - See README for the prerequisites and the full description.' + # # The embedded gdb is built for the selected target only -- gdb, bfd and # opcodes already default to that -- without the full-screen TUI and diff --git a/README b/README index 1f8004842b0a..106c000f65a3 100644 --- a/README +++ b/README @@ -89,6 +89,10 @@ $ make DEBUG=1 + A summary of the available make targets and build options is printed by: + + $ make help + Changing the target ("make target=...") or toggling DEBUG on an existing build tree does not recompile objects that are already up to date. Run "make clean" before rebuilding, and also remove the gdb-16.2 directory if -- 2.51.1

gdb's configure creates config.status near the start of its run but only generates gdb/Makefile near the end. A build interrupted with Ctrl-C in between therefore left gdb_merge believing that gdb was configured, and the incremental path then failed with the confusing make[3]: *** No targets specified and no makefile found. Stop. Write a .configured marker only after the configure script has finished and test that instead, so such a tree is reconfigured rather than trusted. When a tree is still incomplete, say so where the failure is visible and point at "make distclean" instead of leaving make's message alone: - rebuild reports the missing gdb/Makefile rather than letting the gdb sub-make fail with "No targets specified and no makefile found" - the "crash build failed" check adds the same advice when the marker shows that configure did not complete The target-mismatch instructions in configure.c now also note that "make distclean" replaces the two manual steps. Assisted-by: LLM Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn&gt; --- Makefile | 23 +++++++++++++++++++++-- configure.c | 4 +++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3739bfa394a1..374f7b03e78a 100644 --- a/Makefile +++ b/Makefile @@ -383,23 +383,42 @@ help: # opcodes already default to that -- without the full-screen TUI and # without the libctf and libbacktrace libraries, none of which crash uses. # +# .configured is written only after the gdb configure script has finished. +# gdb's config.status is created near the start of its configure run, so +# testing for that would mistake a configure interrupted with Ctrl-C for a +# complete one, and the incremental path below would then fail with +# "No targets specified and no makefile found". +# gdb_merge: force @if [ ! -f ${GDB}/README ]; then \ $(MAKE) gdb_unzip; fi @echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj @rm -f ${PROGRAM} - @if [ ! -f ${GDB}/config.status ]; then \ + @if [ ! -f ${GDB}/.configured ]; then \ (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \ --with-bugurl="" --with-expat=no --with-python=no --disable-sim \ - --disable-tui --disable-libctf --disable-libbacktrace; \ + --disable-tui --disable-libctf --disable-libbacktrace && \ + touch .configured; \ $(MAKE) CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \ else $(MAKE) rebuild; fi @if [ ! -f ${PROGRAM} ]; then \ echo; echo "${PROGRAM} build failed"; \ + if [ ! -f ${GDB}/.configured ]; then \ + echo; \ + echo "The embedded gdb was not configured completely, which is what an"; \ + echo "interrupted build leaves behind; \"make distclean\" removes the"; \ + echo "build products so the build can start over cleanly."; fi; \ echo; exit 1; fi rebuild: + @if [ ! -f ${GDB}/gdb/Makefile ]; then \ + echo; \ + echo "${GDB}/gdb/Makefile does not exist, so the embedded gdb was left"; \ + echo "unconfigured -- an interrupted build leaves it in this state."; \ + echo "Remove the build products and start over with:"; \ + echo; echo " make distclean"; \ + echo; exit 1; fi @if [ ! -f ${GDB}/${GDB}.patch ]; then \ touch ${GDB}/${GDB}.patch; fi @if [ -f ${GDB}.patch ] && [ -s ${GDB}.patch ] && \ diff --git a/configure.c b/configure.c index 615fdddd32c5..29129c94fca8 100644 --- a/configure.c +++ b/configure.c @@ -390,7 +390,9 @@ target_rebuild_instructions(struct supported_gdb_version *sp, char *target) fprintf(stderr, " 1. remove the %s subdirectory\n", &sp->GDB[strlen("GDB=")]); fprintf(stderr, " 2. perform a \"make clean\"\n"); - fprintf(stderr, " 3. retry the build\n\n"); + fprintf(stderr, " 3. retry the build\n"); + fprintf(stderr, + "\nOr do steps 1 and 2 with a single \"make distclean\".\n\n"); } void -- 2.51.1