diff options
Diffstat (limited to 'bridges/Library_cpp_uno.mk')
-rw-r--r-- | bridges/Library_cpp_uno.mk | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 3a31bf69fc7c..7b10348e83b7 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -15,9 +15,9 @@ ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_arm bridge_noopt_objects := cpp2uno except uno2cpp # HACK -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ +$(call gb_Library_get_linktarget_target,gcc3_uno) : \ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ +$(call gb_Library_get_linktarget_target,gcc3_uno) : \ EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist endif @@ -77,14 +77,13 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel bridge_asm_objects := call bridge_exception_objects := cpp2uno except uno2cpp bridge_noncallexception_objects := callvirtualmethod -else ifeq ($(OS),SOLARIS) -bridges_SELECTED_BRIDGE := gcc3_solaris_intel -bridge_exception_objects := cpp2uno except uno2cpp -bridge_noncallexception_objects := callvirtualmethod else ifeq ($(COM),MSC) bridges_SELECTED_BRIDGE := msvc_win32_intel bridge_exception_objects := cpp2uno uno2cpp bridge_noopt_objects := except +else ifeq ($(OS),EMSCRIPTEN) +bridges_SELECTED_BRIDGE := gcc3_wasm +bridge_noopt_objects := cpp2uno except uno2cpp endif else ifeq ($(CPUNAME),M68K) @@ -94,7 +93,7 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k bridge_noopt_objects := cpp2uno except uno2cpp endif -else ifeq ($(CPUNAME),GODSON) +else ifeq ($(CPUNAME),MIPS) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips @@ -102,7 +101,7 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif -else ifeq ($(CPUNAME),GODSON64) +else ifeq ($(CPUNAME),MIPS64) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips64 @@ -111,16 +110,30 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif +else ifeq ($(CPUNAME),LOONGARCH64) + +ifneq ($(filter LINUX,$(OS)),) +bridges_SELECTED_BRIDGE := gcc3_linux_loongarch64 +bridge_asm_objects := call +bridge_noopt_objects := abi cpp2uno uno2cpp +bridge_exception_objects := except +endif + +else ifeq ($(CPUNAME),RISCV64) + +ifneq ($(filter LINUX,$(OS)),) +bridges_SELECTED_BRIDGE := gcc3_linux_riscv64 +bridge_asm_objects := call +bridge_noopt_objects := abi cpp2uno uno2cpp +bridge_exception_objects := except +endif + else ifeq ($(CPUNAME),POWERPC) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_powerpc bridge_noopt_objects := uno2cpp bridge_exception_objects := cpp2uno except -else ifeq ($(OS),AIX) -bridges_SELECTED_BRIDGE := gcc3_aix_powerpc -bridge_exception_objects := except -bridge_cxx_objects := cpp2uno uno2cpp endif else ifeq ($(CPUNAME),POWERPC64) @@ -131,13 +144,6 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif -else ifeq ($(CPUNAME),S390) - -ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) -bridges_SELECTED_BRIDGE := gcc3_linux_s390 -bridge_exception_objects := cpp2uno except uno2cpp -endif - else ifeq ($(CPUNAME),S390X) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) @@ -152,10 +158,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_sparc bridge_asm_objects := call bridge_noopt_objects := except bridge_exception_objects := cpp2uno uno2cpp -else ifeq ($(OS),SOLARIS) -bridges_SELECTED_BRIDGE := gcc3_solaris_sparc -bridge_noopt_objects := cpp2uno uno2cpp -bridge_exception_objects := except endif else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC64) @@ -215,7 +217,6 @@ endif # it off. ifeq ($(COM),GCC) $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ - $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-I$(ANDROID_BINUTILS_PREBUILT_ROOT)/lib/gcc/arm-linux-androideabi/4.9.x/include) \ -fno-omit-frame-pointer \ -fno-strict-aliasing \ -fno-lto \ @@ -289,4 +290,8 @@ $(eval $(call gb_Library_add_cxxobjects,$(CPPU_ENV)_uno,\ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) +ifeq ($(DISABLE_DYNLOADING),TRUE) +$(eval $(call gb_Library_set_plugin_for_nodep,$(CPPU_ENV)_uno,cppu)) +endif + # vim: set noet sw=4 ts=4: |