diff mbox

[PR,translation/79638] "%ntid.y" confuses gcc.pot generation (was: [PATCH] Fix exgettext to handle multi-line help texts from *.opt files (PR translation/78745))

Message ID 87wpcjes8c.fsf@hertz.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Feb. 21, 2017, 10:46 a.m. UTC 
Hi!

On Thu, 16 Feb 2017 23:33:54 +0000, Joseph Myers <joseph@codesourcery.com> wrote:
> [...] So I 
> think one of the local fixes to avoid this particular case being 
> misdetected as a spec string should be preferred.

Committed to trunk in r245623 (but I have not regenerated the gcc.pot
file):

commit 74a4a36d1369f295a6f0ce8c2fc2547246fb15fa
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue Feb 21 10:42:07 2017 +0000

    [PR translation/79638] "%ntid.y" confuses gcc.pot generation
    
            gcc/
            * config/nvptx/nvptx.c (ENTRY_TEMPLATE): Single out "%ntid.y".
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245623 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog            | 5 +++++
 gcc/config/nvptx/nvptx.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)



Grüße
 Thomas
diff mbox

Patch

diff --git gcc/ChangeLog gcc/ChangeLog
index d23fcbf..fe9018f 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,3 +1,8 @@ 
+2017-02-21  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR translation/79638
+	* config/nvptx/nvptx.c (ENTRY_TEMPLATE): Single out "%ntid.y".
+
 2017-02-21  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/67205
diff --git gcc/config/nvptx/nvptx.c gcc/config/nvptx/nvptx.c
index 98278d3..c52b090 100644
--- gcc/config/nvptx/nvptx.c
+++ gcc/config/nvptx/nvptx.c
@@ -1123,13 +1123,15 @@  write_omp_entry (FILE *file, const char *name, const char *orig)
       func_decls << ".extern .func gomp_nvptx_main (.param.u" << POINTER_SIZE
         << " %in_ar1, .param.u" << POINTER_SIZE << " %in_ar2);\n";
     }
+  /* PR79332.  Single out this string; it confuses gcc.pot generation.  */
+#define NTID_Y "%ntid.y"
 #define ENTRY_TEMPLATE(PS, PS_BYTES, MAD_PS_32) "\
  (.param.u" PS " %arg, .param.u" PS " %stack, .param.u" PS " %sz)\n\
 {\n\
 	.reg.u32 %r<3>;\n\
 	.reg.u" PS " %R<4>;\n\
 	mov.u32 %r0, %tid.y;\n\
-	mov.u32 %r1, %ntid.y;\n\
+	mov.u32 %r1, " NTID_Y ";\n\
 	mov.u32 %r2, %ctaid.x;\n\
 	cvt.u" PS ".u32 %R1, %r0;\n\
 	" MAD_PS_32 " %R1, %r1, %r2, %R1;\n\
@@ -1157,6 +1159,7 @@  write_omp_entry (FILE *file, const char *name, const char *orig)
   static const char entry64[] = ENTRY_TEMPLATE ("64", "8", "mad.wide.u32");
   static const char entry32[] = ENTRY_TEMPLATE ("32", "4", "mad.lo.u32  ");
 #undef ENTRY_TEMPLATE
+#undef NTID_Y
   const char *entry_1 = TARGET_ABI64 ? entry64 : entry32;
   /* Position ENTRY_2 after the embedded nul using strlen of the prefix.  */
   const char *entry_2 = entry_1 + strlen (entry64) + 1;