From: Michael Ow Date: Wed, 25 Apr 2012 17:18:08 +0000 (+0000) Subject: ICU-9279 Fix mingw64 build error X-Git-Tag: milestone-59-0-1~3846 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4369cf56b11a98dd81cf6fcfdd5ccdada01c605;p=icu ICU-9279 Fix mingw64 build error X-SVN-Rev: 31770 --- diff --git a/icu4c/source/tools/toolutil/pkg_genc.c b/icu4c/source/tools/toolutil/pkg_genc.c index 57c6f6192d7..e0e91bdefea 100644 --- a/icu4c/source/tools/toolutil/pkg_genc.c +++ b/icu4c/source/tools/toolutil/pkg_genc.c @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (C) 2009-2011, International Business Machines + * Copyright (C) 2009-2012, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* */ @@ -51,6 +51,14 @@ #define HEX_0X 0 /* 0x1234 */ #define HEX_0H 1 /* 01234h */ +/* + * The following is needed by MinGW64 + */ +#ifndef __USER_LABEL_PREFIX__ +#define __USER_LABEL_PREFIX__ _ +#endif +#define GCC_LABEL_PREFIX_INTERNAL(a) #a +#define GCC_LABEL_PREFIX(a) GCC_LABEL_PREFIX_INTERNAL(a) /* prototypes --------------------------------------------------------------- */ static void @@ -135,10 +143,10 @@ static const struct AssemblyType { ".long ","",HEX_0X }, {"gcc-cygwin", - ".globl _%s\n" + ".globl "GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s\n" "\t.section .rodata\n" "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */ - "_%s:\n\n", + GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s:\n\n", ".long ","",HEX_0X },