Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...

1 files changed, 25 insertions, 2 deletions

diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index edd3f39a080a..d83f2322893a 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1097,9 +1097,32 @@ void expr_fprint(struct expr *e, FILE *out)
 
 static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
 {
-        str_append((struct gstr*)data, str);
+        struct gstr *gs = (struct gstr*)data;
+        const char *sym_str = NULL;
+
+        if (sym)
+                sym_str = sym_get_string_value(sym);
+
+        if (gs->max_width) {
+                unsigned extra_length = strlen(str);
+                const char *last_cr = strrchr(gs->s, '\n');
+                unsigned last_line_length;
+
+                if (sym_str)
+                        extra_length += 4 + strlen(sym_str);
+
+                if (!last_cr)
+                        last_cr = gs->s;
+
+                last_line_length = strlen(gs->s) - (last_cr - gs->s);
+
+                if ((last_line_length + extra_length) > gs->max_width)
+                        str_append(gs, "\\\n");
+        }
+
+        str_append(gs, str);
         if (sym)
-                str_printf((struct gstr*)data, " [=%s]", sym_get_string_value(sym));
+                str_printf(gs, " [=%s]", sym_str);
 }
 
 void expr_gstr_print(struct expr *e, struct gstr *gs)