--- misc/icu/source/tools/toolutil/pkg_genc.h +++ misc/build/icu/source/tools/toolutil/pkg_genc.h @@ -58,7 +58,7 @@ #endif #define LARGE_BUFFER_MAX_SIZE 2048 -#define SMALL_BUFFER_MAX_SIZE 512 +#define SMALL_BUFFER_MAX_SIZE 2048 #define SMALL_BUFFER_FLAG_NAMES 32 #define BUFFER_PADDING_SIZE 20 --- misc/icu/source/tools/toolutil/pkg_genc.c +++ misc/build/icu/source/tools/toolutil/pkg_genc.c @@ -145,6 +145,28 @@ ".long ","",HEX_0X }, + {"gcc-android-arm", + "\t.arch armv5te\n" + "\t.fpu softvfp\n" + "\t.eabi_attribute 20, 1\n" + "\t.eabi_attribute 21, 1\n" + "\t.eabi_attribute 23, 3\n" + "\t.eabi_attribute 24, 1\n" + "\t.eabi_attribute 25, 1\n" + "\t.eabi_attribute 26, 2\n" + "\t.eabi_attribute 30, 6\n" + "\t.eabi_attribute 18, 4\n" + "\t.file \"%s.s\"\n" + "\t.global %s\n" + "\t.section .rodata\n" + "\t.align 2\n" + "\t.type %s, %%object\n" + "%s:\n", + + "\t.word ", + "\t.section .note.GNU-stack,\"\",%%progbits\n", + HEX_0X + }, {"sun", "\t.section \".rodata\"\n" "\t.align 8\n" --- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200 +++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100 @@ -25,11 +25,7 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) ## Compiler switches to embed a library name and version information -ifeq ($(ENABLE_RPATH),YES) -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) -else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -endif +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__________________________________________________OOO/$(notdir $(MIDDLE_SO_TARGET)) ## Compiler switch to embed a runtime search path LD_RPATH= @@ -45,10 +41,6 @@ ## Non-shared intermediate object suffix STATIC_O = ao -## Override Versioned target for a shared library. -FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) - ## Compilation and dependency rules %.$(STATIC_O): $(srcdir)/%.c $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) @@ -80,16 +72,10 @@ ## Versioned libraries rules -%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) $(RM) $@ && ln -s ${distro/collabora/dcm-7.5 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/jvmfwk/source/fwkutil.cxx
AgeCommit message (Expand)Author
2016-10-16clang-cl loplugin: jvmfwkStephan Bergmann
2016-04-05Values read from the Windows registry shouldn't be assert'edStephan Bergmann
2016-03-15tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionalsRohan Kumar
2016-02-17use consistent #define checks for the Windows platformNoel Grandin
2015-10-25tdf#39440: fix several warnings reported by cppcheckSerge Krot
2015-06-17Replace boost::scoped_array<T> with std::unique_ptr<T[]>Takeshi Abe
2015-01-20Some more loplugin:cstylecast: jvmfwkStephan Bergmann
2014-12-08callcatcher: update unused codeCaolán McNamara
2014-12-04callcatcher: update unused codeCaolán McNamara
2014-04-21Avoid possible memory leaks in case of exceptionsTakeshi Abe