re PR translation/42467 (exgettext should not remove TABs from option help strings)

gcc/po/
2010-01-11  Joseph Myers  <joseph@codesourcery.com>
            Shujing Zhao  <pearly.zhao@oracle.com>

        PR translation/42467
        * exgettext: Keep the text before tab character in the option help
        string at *.opt file.

gcc/
2010-01-11  Joseph Myers  <joseph@codesourcery.com>
            Shujing Zhao  <pearly.zhao@oracle.com>

        PR translation/42469
        * common.opt (Wframe-larger-than=, fcompare-debug=, fdbg-cnt=,
        fira-verbose=, flto-compression-level=, fplugin-arg-): Use tab
        character between option name and help text.
        * c.opt (imultilib): Likewise.

gcc/fortran
2010-01-11  Joseph Myers  <joseph@codesourcery.com>
            Shujing Zhao  <pearly.zhao@oracle.com>

        PR translation/42469
        * lang.opt (fblas-matmul-limit=, finit-character=, finit-integer=,
        finit-logical=, finit-real=, fmax-array-constructor=): Use tab
        character between option name and help text.

Co-Authored-By: Shujing Zhao <pearly.zhao@oracle.com>
From-SVN: r155801

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5ef0cf3acdaf701482340644a876dd33e073c1a..2c1e71525e2e45b702dc6bd97f95083788d19718 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-11  Joseph Myers  <joseph@codesourcery.com>
+           Shujing Zhao  <pearly.zhao@oracle.com>
+       
+       PR translation/42469
+       * common.opt (Wframe-larger-than=, fcompare-debug=, fdbg-cnt=,
+       fira-verbose=, flto-compression-level=, fplugin-arg-): Use tab
+       character between option name and help text.
+       * c.opt (imultilib): Likewise.
+
 2010-01-10  Rafael Avila de Espindola  <espindola@google.com>
 
        * lto-streamer-out.c (output_unreferenced_globals): Output static

diff --git a/gcc/c.opt b/gcc/c.opt
index bdf9531ad80499869c59194a2bf9cfdce775f5f8..e30aef3e699bee2609e634c7199fb99ce9d46624 100644 (file)
--- a/gcc/c.opt
+++ b/gcc/c.opt
@@ -875,7 +875,7 @@ C ObjC C++ ObjC++ Joined Separate
 
 imultilib
 C ObjC C++ ObjC++ Joined Separate
--imultilib <dir> Set <dir> to be the multilib include subdirectory
+-imultilib <dir>       Set <dir> to be the multilib include subdirectory
 
 include
 C ObjC C++ ObjC++ Joined Separate

diff --git a/gcc/common.opt b/gcc/common.opt
index 8e8ed7620052bab0fb835108bb7335bf2d2d77aa..6e369e551020c67e33929bcafcc36c9031883900 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -115,7 +115,7 @@ Exit on the first error occurred
 
 Wframe-larger-than=
 Common RejectNegative Joined UInteger
--Wframe-larger-than=<number> Warn if a function's stack frame requires more than <number> bytes
+-Wframe-larger-than=<number>   Warn if a function's stack frame requires more than <number> bytes
 
 Winline
 Common Var(warn_inline) Warning
@@ -386,7 +386,7 @@ Do not put uninitialized globals in the common section
 
 fcompare-debug=
 Common JoinedOrMissing RejectNegative Var(flag_compare_debug_opt)
--fcompare-debug[=<opts>] Compile with and without e.g. -gtoggle, and compare the final-insns dump
+-fcompare-debug[=<opts>]       Compile with and without e.g. -gtoggle, and compare the final-insns dump
 
 fcompare-debug-second
 Common RejectNegative Var(flag_compare_debug)
@@ -430,7 +430,7 @@ List all available debugging counters with their limits and counts.
 
 fdbg-cnt=
 Common RejectNegative Joined
--fdbg-cnt=<counter>:<limit>[,<counter>:<limit>,...]    Set the debug counter limit.   
+-fdbg-cnt=<counter>:<limit>[,<counter>:<limit>,...]    Set the debug counter limit.   
 
 fdebug-prefix-map=
 Common Joined RejectNegative
@@ -736,7 +736,7 @@ Share stack slots for spilled pseudo-registers.
 
 fira-verbose=
 Common RejectNegative Joined UInteger
--fira-verbose=<number> Control IRA's level of diagnostic messages.
+-fira-verbose=<number> Control IRA's level of diagnostic messages.
 
 fivopts
 Common Report Var(flag_ivopts) Init(1) Optimization
@@ -769,7 +769,7 @@ Enable link-time optimization.
 ; The initial value of -1 comes from Z_DEFAULT_COMPRESSION in zlib.h.
 flto-compression-level=
 Common Joined UInteger Var(flag_lto_compression_level) Init(-1)
--flto-compression-level=<number> Use zlib compression level <number> for IL
+-flto-compression-level=<number>       Use zlib compression level <number> for IL
 
 flto-report
 Common Report Var(flag_lto_report) Init(0) Optimization
@@ -908,7 +908,7 @@ Specify a plugin to load
 
 fplugin-arg-
 Common Joined RejectNegative
--fplugin-arg-<name>-<key>[=<value>] Specify argument <key>=<value> for plugin <name>
+-fplugin-arg-<name>-<key>[=<value>]    Specify argument <key>=<value> for plugin <name>
 
 fpredictive-commoning
 Common Report Var(flag_predictive_commoning) Optimization

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d6ec8aa559707de3e9bf450c0cbca8747f172613..09bfccfe003630197717b3e522fcb48948e1c642 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-11  Joseph Myers  <joseph@codesourcery.com>  
+           Shujing Zhao  <pearly.zhao@oracle.com>
+
+       PR translation/42469
+       * lang.opt (fblas-matmul-limit=, finit-character=, finit-integer=,
+       finit-logical=, finit-real=, fmax-array-constructor=): Use tab
+       character between option name and help text.
+
 2010-01-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
 
        PR fortran/20923

diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 10f4a891e12ddd10e60e4b94df3a2a182b13bccc..b64dbc7f3861c8d979073b4cccdb657fda5c50fc 100644 (file)
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -166,7 +166,7 @@ Produce a backtrace when a runtime error is encountered
 
 fblas-matmul-limit=
 Fortran RejectNegative Joined UInteger
--fblas-matmul-limit=<n>        Size of the smallest matrix for which matmul will use BLAS
+-fblas-matmul-limit=<n>        Size of the smallest matrix for which matmul will use BLAS
 
 fcheck-array-temporaries
 Fortran
@@ -270,11 +270,11 @@ Specify that no implicit typing is allowed, unless overridden by explicit IMPLIC
 
 finit-character=
 Fortran RejectNegative Joined UInteger
--finit-character=<n> Initialize local character variables to ASCII value n
+-finit-character=<n>   Initialize local character variables to ASCII value n
 
 finit-integer=
 Fortran RejectNegative Joined
--finit-integer=<n> Initialize local integer variables to n
+-finit-integer=<n>     Initialize local integer variables to n
 
 finit-local-zero
 Fortran
@@ -282,15 +282,15 @@ Initialize local variables to zero (from g77)
 
 finit-logical=
 Fortran RejectNegative Joined
--finit-logical=<true|false> Initialize local logical variables
+-finit-logical=<true|false>    Initialize local logical variables
 
 finit-real=
 Fortran RejectNegative Joined
--finit-real=<zero|nan|inf|-inf> Initialize local real variables
+-finit-real=<zero|nan|inf|-inf>        Initialize local real variables
 
 fmax-array-constructor=
 Fortran RejectNegative Joined UInteger
--fmax-array-constructor=<n>        Maximum number of objects in an array constructor
+-fmax-array-constructor=<n>    Maximum number of objects in an array constructor
 
 fmax-errors=
 Fortran RejectNegative Joined UInteger

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 1a317c396b02e78fada8057bf567fd8eb53bc0d3..bdc551f6133cfeaa413fd281fe03fc3106278bd4 100644 (file)
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-11  Joseph Myers  <joseph@codesourcery.com>
+           Shujing Zhao  <pearly.zhao@oracle.com>
+           
+       PR translation/42467
+       * exgettext: Keep the text before tab character in the option help
+       string at *.opt file.
+
 2010-01-10  Joseph Myers  <joseph@codesourcery.com>
 
        * sv.po: Update.

diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 6b784e4aaa4c9afe35693af8d7bc657ae11774f5..9c2248206038a53fe5d31b2e98f581a0e7c52840 100644 (file)
--- a/gcc/po/exgettext
+++ b/gcc/po/exgettext
@@ -197,7 +197,6 @@ echo "scanning option files..." >&2
        } else {
            if (field == 2) {
                line = $0
-               gsub(".*\t", "", line)
                printf("#line %d \"%s\"\n", lineno, file)
                printf("_(\"%s\")\n", line)
            }