diff --git a/icu4c/source/aclocal.m4 b/icu4c/source/aclocal.m4 index a67979c50fc..7991322e58c 100644 --- a/icu4c/source/aclocal.m4 +++ b/icu4c/source/aclocal.m4 @@ -31,12 +31,15 @@ powerpc*-*-linux*) icu_cv_host_frag=mh-linux-va fi ;; *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; -*-*-cygwin|*-*-mingw32) +*-*-cygwin|*-*-mingw32|*-*-mingw64) if test "$GCC" = yes; then AC_TRY_COMPILE([ #ifndef __MINGW32__ #error This is not MinGW -#endif], [], icu_cv_host_frag=mh-mingw, icu_cv_host_frag=mh-cygwin) +#endif], [], AC_TRY_COMPILE([ +#ifndef __MINGW64__ +#error This is not MinGW64 +#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin) else icu_cv_host_frag=mh-cygwin-msvc fi ;; diff --git a/icu4c/source/config/mh-mingw b/icu4c/source/config/mh-mingw index 7ca4248819b..4b8694419d3 100644 --- a/icu4c/source/config/mh-mingw +++ b/icu4c/source/config/mh-mingw @@ -5,6 +5,9 @@ # TODO: Finish the rest of this port. This platform port is incomplete. +# This file is similar to mh-mingw64 +# Any changes made here may also need to be made in mh-mingw64 + # We install sbin tools into the same bin directory because # pkgdata needs some of the tools in sbin, and we can't always depend on # icu-config working on Windows. diff --git a/icu4c/source/config/mh-mingw64 b/icu4c/source/config/mh-mingw64 new file mode 100644 index 00000000000..c5c7bfafdb0 --- /dev/null +++ b/icu4c/source/config/mh-mingw64 @@ -0,0 +1,146 @@ +## -*-makefile-*- +## Cygwin64/MinGW64 specific setup +## Copyright (c) 2012, International Business Machines Corporation and +## others. All Rights Reserved. + +# TODO: Finish the rest of this port. This platform port is incomplete. + +# This file is similar to mh-mingw +# Any changes made here may also need to be made in mh-mingw + +# We install sbin tools into the same bin directory because +# pkgdata needs some of the tools in sbin, and we can't always depend on +# icu-config working on Windows. +sbindir=$(bindir) + +## Commands to generate dependency files +GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) +GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) + +## Flags to create/use a static library +ifneq ($(ENABLE_SHARED),YES) +## Make sure that the static libraries can be built and used +CPPFLAGS += -DU_STATIC_IMPLEMENTATION +else +## Make sure that the static libraries can be built +STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION +endif + +## Flags for position independent code +SHAREDLIBCFLAGS = +SHAREDLIBCXXFLAGS = +SHAREDLIBCPPFLAGS = -DPIC + +## Additional flags when building libraries and with threads +THREADSCFLAGS = -mthreads +THREADSCXXFLAGS = -mthreads +LIBCPPFLAGS = + +# Commands to link. Link with C++ in case static libraries are used. +LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) +#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) + +## Shared library options +LD_SOOPTIONS= -Wl,-Bsymbolic + +## Commands to make a shared library +SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# +SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M# + +## Compiler switch to embed a runtime search path +LD_RPATH= +LD_RPATH_PRE= -Wl,-rpath, + +## Compiler switch to embed a library name +LD_SONAME = + +## Shared object suffix +SO = dll +## Non-shared intermediate object suffix +STATIC_O = ao + +ifeq ($(ENABLE_SHARED),YES) +SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) +else +SO_TARGET_VERSION_SUFFIX = +endif + +# Static library prefix and file extension +LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +A = a + +## An import library is needed for z/OS and MSVC +IMPORT_LIB_EXT = .lib + +LIBPREFIX= + +# Change the stubnames so that poorly working FAT disks and installation programs can work. +# This is also for backwards compatibility. +DATA_STUBNAME = dt +I18N_STUBNAME = in +LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) + +# The #M# is used to delete lines for icu-config +# Current full path directory. +#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS +CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell +# Current full path directory for use in source code in a -D compiler option. +#CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS +CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell + +## Compilation rules +%.$(STATIC_O): $(srcdir)/%.c + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< +%.o: $(srcdir)/%.c + $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< + +%.$(STATIC_O): $(srcdir)/%.cpp + $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< +%.o: $(srcdir)/%.cpp + $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< + + +## Dependency rules +%.d: $(srcdir)/%.c + @echo "generating dependency information for $<" + @echo -n "$@ " > $@ + @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE) + +%.d: $(srcdir)/%.cpp + @echo "generating dependency information for $<" + @echo -n "$@ " > $@ + @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE) + +## Versioned target for a shared library. +## Since symbolic links don't work the same way on Windows, +## we only use the version major number. +#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) +FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) +MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) + +FINAL_IMPORT_LIB = $(dir $(SO_TARGET))$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# +IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# +MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# + +## Special pkgdata information that is needed +PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR) +#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# +#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# + +## Versioned libraries rules +#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) +# $(RM) $@ && cp ${conftest.$ac_ext /* end confdefs.h. */ @@ -4863,7 +4863,26 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifndef __MINGW64__ +#error This is not MinGW64 +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + icu_cv_host_frag=mh-mingw64 +else icu_cv_host_frag=mh-mingw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else icu_cv_host_frag=mh-cygwin fi diff --git a/icu4c/source/tools/toolutil/pkg_genc.c b/icu4c/source/tools/toolutil/pkg_genc.c index dc87188a22c..5c041e9f840 100644 --- a/icu4c/source/tools/toolutil/pkg_genc.c +++ b/icu4c/source/tools/toolutil/pkg_genc.c @@ -51,15 +51,6 @@ #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 getOutFilename(const char *inFilename, const char *destdir, char *outFilename, char *entryName, const char *newSuffix, const char *optFilename); @@ -143,10 +134,18 @@ static const struct AssemblyType { ".long ","",HEX_0X }, {"gcc-cygwin", - ".globl "GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s\n" + ".globl _%s\n" "\t.section .rodata\n" "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */ - GCC_LABEL_PREFIX(__USER_LABEL_PREFIX__) "%s:\n\n", + "_%s:\n\n", + + ".long ","",HEX_0X + }, + {"gcc-mingw64", + ".globl %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", ".long ","",HEX_0X },