diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-20 16:07:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-30 11:06:48 +0200 |
| commit | 1295f497e0cc7fc7cfcb66182496a4d29aa701b3 (patch) | |
| tree | 3deacf9ec953301037f1c21aa9b756f5ca1fb332 | |
| parent | Prepare for removal of non-const operator[] from Sequence in i18npool (diff) | |
| download | core-1295f497e0cc7fc7cfcb66182496a4d29aa701b3.tar.gz core-1295f497e0cc7fc7cfcb66182496a4d29aa701b3.zip | |
upgrade libjpeg-turbo to 2.1.1
simd enabled for x86_64 and x86, arm/aarch64 might be worth exploring
too
Change-Id: Ic2726ee8c6b6e59ca983b977ee2731f5b78b97d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123898
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
25 files changed, 482 insertions, 228 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 951267d0e624..23d4b2e63637 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -402,6 +402,10 @@ endif # SYSTEM_ZLIB ifneq ($(SYSTEM_LIBJPEG),) define gb_LinkTarget__use_libjpeg +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBJPEG_CFLAGS) \ +) $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ @@ -414,12 +418,12 @@ gb_ExternalProject__use_libjpeg := else define gb_LinkTarget__use_libjpeg +$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) $(call gb_LinkTarget_set_include,$(1),\ - $(LIBJPEG_CFLAGS) \ + -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) -$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) +$(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo) endef diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index d89dd8eca296..11230c695248 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -111,7 +111,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ $oslibs \ $WORKDIR/UnpackedTarball/icu/source/lib/*.a \ - $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \ $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \ $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \ $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \ diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh index 39ff8a8d8d5b..22c9ef2b7e49 100755 --- a/bin/oss-fuzz-setup.sh +++ b/bin/oss-fuzz-setup.sh @@ -21,7 +21,7 @@ curl --no-progress-meter -S \ -C - -O https://dev-www.libreoffice.org/src/dtoa-20180411.tgz \ -C - -O https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2 \ -C - -O https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz \ - -C - -O https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz \ + -C - -O https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz \ -C - -O https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz \ -C - -O https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz \ -C - -O https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz \ diff --git a/config_host.mk.in b/config_host.mk.in index 3970cb6a61c9..4b4f58f80fc2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -452,6 +452,7 @@ export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@ export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@ export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@ export NASM=@NASM@ +export NAFLAGS=@NAFLAGS@ export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@ export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@ export NEON_VERSION=@NEON_VERSION@ @@ -560,6 +561,7 @@ export SERF_CFLAGS=$(gb_SPACE)@SERF_CFLAGS@ export SERF_LIBS=$(gb_SPACE)@SERF_LIBS@ export SHA256SUM=@SHA256SUM@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ +export SIZEOF_SIZE_T=@SIZEOF_SIZE_T@ export SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=@SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX@ export SKIA_GPU=@SKIA_GPU@ export SOLARINC=@SOLARINC@ diff --git a/configure.ac b/configure.ac index 8b35199de6da..f2062daf62ac 100644 --- a/configure.ac +++ b/configure.ac @@ -6832,12 +6832,14 @@ if test "$_os" != "WINNT"; then AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(double) AC_CHECK_SIZEOF(void*) + AC_CHECK_SIZEOF(size_t) SAL_TYPES_SIZEOFSHORT=$ac_cv_sizeof_short SAL_TYPES_SIZEOFINT=$ac_cv_sizeof_int SAL_TYPES_SIZEOFLONG=$ac_cv_sizeof_long SAL_TYPES_SIZEOFLONGLONG=$ac_cv_sizeof_long_long SAL_TYPES_SIZEOFPOINTER=$ac_cv_sizeof_voidp + SIZEOF_SIZE_T=$ac_cv_sizeof_size_t dnl Allow build without AC_CHECK_ALIGNOF, grrr m4_pattern_allow([AC_CHECK_ALIGNOF]) @@ -6899,8 +6901,10 @@ else SAL_TYPES_SIZEOFLONGLONG=8 if test $WIN_HOST_BITS -eq 32; then SAL_TYPES_SIZEOFPOINTER=4 + SIZEOF_SIZE_T=4 else SAL_TYPES_SIZEOFPOINTER=8 + SIZEOF_SIZE_T=8 fi SAL_TYPES_ALIGNMENT2=2 SAL_TYPES_ALIGNMENT4=4 @@ -6908,6 +6912,7 @@ else LFS_CFLAGS='' fi AC_SUBST(LFS_CFLAGS) +AC_SUBST(SIZEOF_SIZE_T) AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFSHORT,$SAL_TYPES_SIZEOFSHORT) AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFINT,$SAL_TYPES_SIZEOFINT) @@ -9080,12 +9085,6 @@ else SYSTEM_LIBJPEG= AC_MSG_RESULT([internal, libjpeg-turbo]) BUILD_TYPE="$BUILD_TYPE LIBJPEG_TURBO" - LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/libjpeg-turbo" - if test "$COM" = "MSC"; then - LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib" - else - LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs -ljpeg" - fi case "$host_cpu" in x86_64 | amd64 | i*86 | x86 | ia32) @@ -9180,17 +9179,17 @@ else AC_MSG_CHECKING([for object file format specifier (NAFLAGS) ]) case "$objfmt" in - MSOMF) NAFLAGS='-fobj -DOBJ32';; - Win32-COFF) NAFLAGS='-fwin32 -DWIN32';; - Win64-COFF) NAFLAGS='-fwin64 -DWIN64 -D__x86_64__';; - COFF) NAFLAGS='-fcoff -DCOFF';; - a.out) NAFLAGS='-faout -DAOUT';; - BSD-a.out) NAFLAGS='-faoutb -DAOUT';; - ELF) NAFLAGS='-felf -DELF';; - ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; - RDF) NAFLAGS='-frdf -DRDF';; - Mach-O) NAFLAGS='-fmacho -DMACHO';; - Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__';; + MSOMF) NAFLAGS='-fobj -DOBJ32 -DPIC';; + Win32-COFF) NAFLAGS='-fwin32 -DWIN32 -DPIC';; + Win64-COFF) NAFLAGS='-fwin64 -DWIN64 -D__x86_64__ -DPIC';; + COFF) NAFLAGS='-fcoff -DCOFF -DPIC';; + a.out) NAFLAGS='-faout -DAOUT -DPIC';; + BSD-a.out) NAFLAGS='-faoutb -DAOUT -DPIC';; + ELF) NAFLAGS='-felf -DELF -DPIC';; + ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__ -DPIC';; + RDF) NAFLAGS='-frdf -DRDF -DPIC';; + Mach-O) NAFLAGS='-fmacho -DMACHO -DPIC';; + Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__ -DPIC';; esac AC_MSG_RESULT([$NAFLAGS]) @@ -9256,6 +9255,7 @@ _EOS fi AC_SUBST(NASM) +AC_SUBST(NAFLAGS) AC_SUBST(LIBJPEG_CFLAGS) AC_SUBST(LIBJPEG_LIBS) AC_SUBST(SYSTEM_LIBJPEG) diff --git a/download.lst b/download.lst index dde3c82b7cdb..46184db628ee 100644 --- a/download.lst +++ b/download.lst @@ -138,8 +138,8 @@ export JFREEREPORT_LIBXML_SHA256SUM := 7d2797fe9f79a77009721e3f14fa4a1dec17a6d70 export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip export JFREEREPORT_SAC_SHA256SUM := 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -export LIBJPEG_TURBO_SHA256SUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 -export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz +export LIBJPEG_TURBO_SHA256SUM := 20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4 +export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.1.tar.gz export LANGTAGREG_SHA256SUM := 08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b export LANGTAGREG_TARBALL := language-subtag-registry-2021-08-06.tar.bz2 export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk deleted file mode 100644 index c5e0556748b4..000000000000 --- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,libjpeg-turbo)) - -$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,configure)) -$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,build)) - -$(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\ - configure \ - build \ -)) - -$(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) - $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) - +$(call gb_ExternalProject_run,build,\ - $(MAKE) \ - ) - $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) - -$(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) : - $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) - $(call gb_ExternalProject_run,configure,\ - MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \ - --build=$(BUILD_PLATFORM) \ - --host=$(HOST_PLATFORM) \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-java \ - --without-turbojpeg \ - $(if $(NASM),,--without-simd) \ - CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \ - ) - $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) - -# vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/Module_libjpeg-turbo.mk b/external/libjpeg-turbo/Module_libjpeg-turbo.mk index 137e7557bacf..29be90155880 100644 --- a/external/libjpeg-turbo/Module_libjpeg-turbo.mk +++ b/external/libjpeg-turbo/Module_libjpeg-turbo.mk @@ -10,8 +10,8 @@ $(eval $(call gb_Module_Module,libjpeg-turbo)) $(eval $(call gb_Module_add_targets,libjpeg-turbo,\ - ExternalProject_libjpeg-turbo \ UnpackedTarball_libjpeg-turbo \ + StaticLibrary_libjpeg-turbo \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk new file mode 100644 index 000000000000..0b6b3044d1b2 --- /dev/null +++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk @@ -0,0 +1,214 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozillarg/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,libjpeg-turbo)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libjpeg-turbo,libjpeg-turbo)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,libjpeg-turbo)) + +$(eval $(call gb_StaticLibrary_set_include,libjpeg-turbo,\ + -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_cflags,libjpeg-turbo,\ + -DHAVE_INTRIN_H=1 \ +)) +endif + +$(eval $(call gb_StaticLibrary_add_cflags,libjpeg-turbo,\ + -DSIZEOF_SIZE_T=$(SIZEOF_SIZE_T) \ +)) + +ifeq ($(COM),GCC) +ifneq ($(ENABLE_OPTIMIZED),) +$(eval $(call gb_StaticLibrary_add_cflags,libjpeg-turbo,\ + -O3 \ +)) +endif +endif + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/jcapimin \ + UnpackedTarball/libjpeg-turbo/jcapistd \ + UnpackedTarball/libjpeg-turbo/jccoefct \ + UnpackedTarball/libjpeg-turbo/jccolor \ + UnpackedTarball/libjpeg-turbo/jcdctmgr \ + UnpackedTarball/libjpeg-turbo/jchuff \ + UnpackedTarball/libjpeg-turbo/jcicc \ + UnpackedTarball/libjpeg-turbo/jcinit \ + UnpackedTarball/libjpeg-turbo/jcmainct \ + UnpackedTarball/libjpeg-turbo/jcmarker \ + UnpackedTarball/libjpeg-turbo/jcmaster \ + UnpackedTarball/libjpeg-turbo/jcomapi \ + UnpackedTarball/libjpeg-turbo/jcparam \ + UnpackedTarball/libjpeg-turbo/jcphuff \ + UnpackedTarball/libjpeg-turbo/jcprepct \ + UnpackedTarball/libjpeg-turbo/jcsample \ + UnpackedTarball/libjpeg-turbo/jctrans \ + UnpackedTarball/libjpeg-turbo/jdapimin \ + UnpackedTarball/libjpeg-turbo/jdapistd \ + UnpackedTarball/libjpeg-turbo/jdatadst \ + UnpackedTarball/libjpeg-turbo/jdatasrc \ + UnpackedTarball/libjpeg-turbo/jdcoefct \ + UnpackedTarball/libjpeg-turbo/jdcolor \ + UnpackedTarball/libjpeg-turbo/jddctmgr \ + UnpackedTarball/libjpeg-turbo/jdhuff \ + UnpackedTarball/libjpeg-turbo/jdicc \ + UnpackedTarball/libjpeg-turbo/jdinput \ + UnpackedTarball/libjpeg-turbo/jdmainct \ + UnpackedTarball/libjpeg-turbo/jdmarker \ + UnpackedTarball/libjpeg-turbo/jdmaster \ + UnpackedTarball/libjpeg-turbo/jdmerge \ + UnpackedTarball/libjpeg-turbo/jdphuff \ + UnpackedTarball/libjpeg-turbo/jdpostct \ + UnpackedTarball/libjpeg-turbo/jdsample \ + UnpackedTarball/libjpeg-turbo/jdtrans \ + UnpackedTarball/libjpeg-turbo/jerror \ + UnpackedTarball/libjpeg-turbo/jfdctflt \ + UnpackedTarball/libjpeg-turbo/jfdctfst \ + UnpackedTarball/libjpeg-turbo/jfdctint \ + UnpackedTarball/libjpeg-turbo/jidctflt \ + UnpackedTarball/libjpeg-turbo/jidctfst \ + UnpackedTarball/libjpeg-turbo/jidctint \ + UnpackedTarball/libjpeg-turbo/jidctred \ + UnpackedTarball/libjpeg-turbo/jquant1 \ + UnpackedTarball/libjpeg-turbo/jquant2 \ + UnpackedTarball/libjpeg-turbo/jutils \ + UnpackedTarball/libjpeg-turbo/jmemmgr \ + UnpackedTarball/libjpeg-turbo/jmemnobs \ + UnpackedTarball/libjpeg-turbo/jaricom \ + UnpackedTarball/libjpeg-turbo/jcarith \ + UnpackedTarball/libjpeg-turbo/jdarith \ +)) + +ifneq ($(NASM),) + +$(eval $(call gb_StaticLibrary_add_nasmflags,libjpeg-turbo,\ + -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/simd/nasm/ \ + -I$(dir $(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/$(1)) \ +)) + +ifeq ($(CPUNAME),X86_64) + +$(eval $(call gb_StaticLibrary_add_cflags,libjpeg-turbo,\ + -DWITH_SIMD \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jsimd \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_nasmobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jsimdcpu.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jccolor-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jcgray-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jchuff-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jcsample-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdsample-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jidctint-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jidctred-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jquantf-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jquanti-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jccolor-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jcgray-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jcsample-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jdsample-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jidctint-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/x86_64/jquanti-avx2.asm \ +)) + +else ifeq ($(CPUNAME),INTEL) + +$(eval $(call gb_StaticLibrary_add_cflags,libjpeg-turbo,\ + -DWITH_SIMD \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/simd/i386/jsimd \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_nasmobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/simd/i386/jsimdcpu.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctflt-3dn.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquant-3dn.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jccolor-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcgray-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcsample-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdcolor-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdmerge-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdsample-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctint-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctfst-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctint-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctred-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquant-mmx.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctflt-sse.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctflt-sse.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquant-sse.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jccolor-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcgray-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jchuff-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcphuff-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcsample-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdcolor-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdmerge-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdsample-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctint-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctflt-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctfst-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctint-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctred-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquantf-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquanti-sse2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jccolor-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcgray-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jcsample-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdcolor-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdmerge-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jdsample-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jfdctint-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jidctint-avx2.asm \ + UnpackedTarball/libjpeg-turbo/simd/i386/jquanti-avx2.asm \ +)) + +else + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/jsimd_none \ +)) + +endif + +else + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/jsimd_none \ +)) + +endif + + +# vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk index a99df67bb011..22777b863e4c 100644 --- a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk +++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk @@ -11,14 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libjpeg-turbo)) $(eval $(call gb_UnpackedTarball_set_tarball,libjpeg-turbo,$(LIBJPEG_TURBO_TARBALL))) -$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libjpeg-turbo)) - $(eval $(call gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0)) -$(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\ - external/libjpeg-turbo/jpeg-turbo.build.patch.1 \ - $(if $(filter WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \ - external/libjpeg-turbo/ubsan.patch \ -)) +# jconfigint.h and jconfig.h generated via +# cmake -DENABLE_STATIC:BOOL=ON -DENABLE_SHARED:BOOL=NO -DWITH_JAVA:BOOL=OFF -DWITH_TURBOJPEG:BOOL=OFF -DWITH_SIMD:BOOL=ON +# and then tweaking + +$(eval $(call gb_UnpackedTarball_add_file,libjpeg-turbo,jconfigint.h,external/libjpeg-turbo/jconfigint.h)) +$(eval $(call gb_UnpackedTarball_add_file,libjpeg-turbo,jconfig.h,external/libjpeg-turbo/jconfig.h)) # vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/jconfig.h b/external/libjpeg-turbo/jconfig.h new file mode 100644 index 000000000000..7cff688125a9 --- /dev/null +++ b/external/libjpeg-turbo/jconfig.h @@ -0,0 +1,86 @@ +/* Version ID for the JPEG library. + * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60". + */ +#define JPEG_LIB_VERSION 62 + +/* libjpeg-turbo version */ +#define LIBJPEG_TURBO_VERSION 2.1.1 + +/* libjpeg-turbo version in integer form */ +#define LIBJPEG_TURBO_VERSION_NUMBER 2001001 + +/* Support arithmetic encoding */ +#define C_ARITH_CODING_SUPPORTED 1 + +/* Support arithmetic decoding */ +#define D_ARITH_CODING_SUPPORTED 1 + +/* Support in-memory source/destination managers */ +#define MEM_SRCDST_SUPPORTED 1 + +/* Use accelerated SIMD routines. */ +/* #undef WITH_SIMD */ + +/* + * Define BITS_IN_JSAMPLE as either + * 8 for 8-bit sample values (the usual setting) + * 12 for 12-bit sample values + * Only 8 and 12 are legal data precisions for lossy JPEG according to the + * JPEG standard, and the IJG code does not support anything else! + * We do not support run-time selection of data precision, sorry. + */ + +#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ + +/* Define to 1 if you have the <locale.h> header file. */ +/* undef HAVE_LOCALE_H */ + +/* Define to 1 if you have the <stddef.h> header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you need to include <sys/types.h> to get size_t. */ +#define NEED_SYS_TYPES_H 1 + +/* Define if you have BSD-like bzero and bcopy in <strings.h> rather than + memset/memcpy in <string.h>. */ +/* #undef NEED_BSD_STRINGS */ + +/* Define to 1 if the system has the type `unsigned char'. */ +#define HAVE_UNSIGNED_CHAR 1 + +/* Define to 1 if the system has the type `unsigned short'. */ +#define HAVE_UNSIGNED_SHORT 1 + +/* Compiler does not support pointers to undefined structures. */ +/* #undef INCOMPLETE_TYPES_BROKEN */ + +/* Define if your (broken) compiler shifts signed values as if they were + unsigned. */ +/* #undef RIGHT_SHIFT_IS_UNSIGNED */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* #undef size_t */ + +/* Extra Libreoffice config for windows */ +#ifdef _MSC_VER + +/* Define "boolean" as unsigned char, not int, per Windows custom */ +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ + +/* Define "INT32" as int, not long, per Windows custom */ +#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ +typedef short INT16; +typedef signed int INT32; +#endif +#define XMD_H /* prevent jmorecfg.h from redefining it */ + +#endif /* _MSC_VER */ diff --git a/external/libjpeg-turbo/jconfigint.h b/external/libjpeg-turbo/jconfigint.h new file mode 100644 index 000000000000..478a4d338b30 --- /dev/null +++ b/external/libjpeg-turbo/jconfigint.h @@ -0,0 +1,51 @@ +#include <sal/types.h> + +/* libjpeg-turbo build number */ +#define BUILD "20211020" + +/* Compiler's inline keyword */ +#undef inline + +/* How to obtain function inlining. */ +#if defined _MSC_VER +#define INLINE __forceinline +#elif defined __GNUC__ +#define INLINE __attribute__((always_inline)) inline +#else +#define INLINE inline +#endif + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libjpeg-turbo" + +/* Version number of package */ +#define VERSION "2.1.1" + +/* The size of `size_t', as computed by sizeof. */ +/* #undef SIZEOF_SIZE_T */ + +#if defined(__GNUC__) && SAL_TYPES_SIZEOFLONG == SIZEOF_SIZE_T +/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ +#define HAVE_BUILTIN_CTZL +#endif + +/* Define to 1 if you have the <intrin.h> header file. */ +/* #undef HAVE_INTRIN_H */ + +#if defined(_MSC_VER) && defined(HAVE_INTRIN_H) +#if (SIZEOF_SIZE_T == 8) +#define HAVE_BITSCANFORWARD64 +#elif (SIZEOF_SIZE_T == 4) +#define HAVE_BITSCANFORWARD +#endif +#endif + +#if defined(__has_attribute) +#if __has_attribute(fallthrough) +#define FALLTHROUGH __attribute__((fallthrough)); +#else +#define FALLTHROUGH +#endif +#else +#define FALLTHROUGH +#endif diff --git a/external/libjpeg-turbo/jpeg-turbo.build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.build.patch.1 deleted file mode 100644 index 4d01ad4b9aed..000000000000 --- a/external/libjpeg-turbo/jpeg-turbo.build.patch.1 +++ /dev/null @@ -1,58 +0,0 @@ -diff -ur jpeg.org/Makefile.am jpeg/Makefile.am ---- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100 -+++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100 -@@ -174,8 +174,6 @@ - rm -rf `find $(distdir) -name .svn` - - --SUBDIRS += md5 -- - if WITH_12BIT - - TESTORIG = testorig12.jpg -diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in ---- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200 -+++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100 -@@ -405,7 +405,7 @@ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = java simd md5 -+DIST_SUBDIRS = java simd - am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/jconfig.h.in \ - $(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \ -@@ -622,7 +622,7 @@ - jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ - jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_4) \ - $(am__append_5) $(am__append_6) $(am__append_11) --SUBDIRS = java $(am__append_10) md5 -+SUBDIRS = java $(am__append_10) - @WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \ - @WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \ - @WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \ -diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure ---- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200 -+++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100 -@@ -14630,9 +14630,7 @@ - $as_echo "yes" >&6; } - else - rm -rf conftest* -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - fi - - -@@ -14828,9 +14826,7 @@ - $as_echo "yes" >&6; } - else - rm -rf conftest* -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - fi - - diff --git a/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 deleted file mode 100644 index 00b642703f3a..000000000000 --- a/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 +++ /dev/null @@ -1,54 +0,0 @@ -Copy definitions of "boolean", "INT16", "INT32" from win/jconfig.h.in - -... into jconfig.h.in, which is the one we use via configure. - -diff -ru jpeg-turbo.orig/simd/Makefile.in jpeg-turbo/simd/Makefile.in ---- jpeg-turbo.orig/simd/Makefile.in 2015-09-21 20:48:45.000000000 +0200 -+++ jpeg-turbo/simd/Makefile.in 2015-11-22 10:52:46.975285184 +0100 -@@ -769,8 +769,8 @@ - .asm.lo: - $(AM_V_GEN) $(LIBTOOL) $(AM_V_lt) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(AM_V_lt) $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ - --jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h -- $(AM_V_GEN) $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ -+jsimdcfg.inc: $(top_srcdir)/win/jsimdcfg.inc -+ cp $< $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure ---- jpeg-turbo.orig/configure 2015-11-22 15:57:23.702656000 +0100 -+++ jpeg-turbo/configure 2015-11-22 15:59:37.084285000 +0100 -@@ -13931,7 +13931,7 @@ - - else - --$as_echo "#define NEED_BSD_STRINGS 1" >>confdefs.h -+$as_echo "#undef NEED_BSD_STRINGS" >>confdefs.h - - fi - done ---- jpeg-turbo/jconfig.h.in.orig 2016-11-02 22:43:55.012600000 +0100 -+++ jpeg-turbo/jconfig.h.in 2016-11-02 22:45:01.905400000 +0100 -@@ -71,3 +71,21 @@ - - /* Define to `unsigned int' if <sys/types.h> does not define. */ - #undef size_t -+ -+#ifdef _MSC_VER -+ -+/* Define "boolean" as unsigned char, not int, per Windows custom */ -+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ -+typedef unsigned char boolean; -+#endif -+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+ -+/* Define "INT32" as int, not long, per Windows custom */ -+#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ -+typedef short INT16; -+typedef signed int INT32; -+#endif -+#define XMD_H /* prevent jmorecfg.h from redefining it */ -+ -+#endif /* _MSC_VER */ -+ diff --git a/external/libjpeg-turbo/ubsan.patch b/external/libjpeg-turbo/ubsan.patch deleted file mode 100644 index 33d3c15a8b3c..000000000000 --- a/external/libjpeg-turbo/ubsan.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- jcphuff.c -+++ jcphuff.c -@@ -14,6 +14,7 @@ - * suspension. - */ - -+#include <stdint.h> - #define JPEG_INTERNALS - #include "jinclude.h" - #include "jpeglib.h" -@@ -255,7 +256,7 @@ - if (c == 0xFF) { /* need to stuff a zero byte? */ - emit_byte(entropy, 0); - } -- put_buffer <<= 8; -+ put_buffer = (uint_least32_t) put_buffer << 8; - put_bits -= 8; - } - ---- jdarith.c -+++ jdarith.c -@@ -306,7 +306,7 @@ - while (m >>= 1) - if (arith_decode(cinfo, st)) v |= m; - v += 1; if (sign) v = -v; -- entropy->last_dc_val[ci] += v; -+ entropy->last_dc_val[ci] = (entropy->last_dc_val[ci] + v) & 0xffff; - } - - /* Scale and output the DC coefficient (assumes jpeg_natural_order[0]=0) */ -@@ -564,7 +564,7 @@ - while (m >>= 1) - if (arith_decode(cinfo, st)) v |= m; - v += 1; if (sign) v = -v; -- entropy->last_dc_val[ci] += v; -+ entropy->last_dc_val[ci] = (entropy->last_dc_val[ci] + v) & 0xffff; - } - - if (block) diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 9cd6b63c4374..a9e433ebe88e 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -1086,6 +1086,11 @@ static int process(struct hash* dep_hash, char* fn) created_line = generate_phony_line(src_relative, "o"); rc = generate_phony_file(fn, created_line); } + else if(strncmp(src_relative, "GenNasmObject/", 14) == 0) + { + created_line = generate_phony_line(src_relative, "o"); + rc = generate_phony_file(fn, created_line); + } else if(strncmp(src_relative, "CxxClrObject/", 13) == 0) { created_line = generate_phony_line(src_relative, "o"); diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 6c08c603267a..b1cd59892b1d 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -166,9 +166,9 @@ endef # Overview of dependencies and tasks of LinkTarget # # target task depends on -# LinkTarget linking AsmObject CObject CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject GenObjCxxObject CxxClrObject GenCxxClrObject +# LinkTarget linking AsmObject CObject CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject GenObjCxxObject GenNasmObject CxxClrObject # LinkTarget/headers -# LinkTarget/dep joined dep file AsmObject/dep CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep GenObjCObject/dep GenObjCxxObject/dep CxxClrObject/dep GenCxxClrObject/dep +# LinkTarget/dep joined dep file AsmObject/dep CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep GenObjCObject/dep GenObjCxxObject/dep GenNasmObject/dep CxxClrObject/dep GenCxxClrObject/dep # | LinkTarget/headers # LinkTarget/headers all headers available # including own generated @@ -185,6 +185,8 @@ endef # generated source # GenObjCxxObject objective c++ compile from | LinkTarget/headers # generated source +# GenNasmObject nasm compile from | LinkTarget/headers +# generated source # CxxClrObject C++ CLR compile | LinkTarget/headers # GenCxxClrObject C++ CLR compile from | LinkTarget/headers # generated source @@ -199,6 +201,7 @@ endef # ObjCxxObject/dep dependencies # GenObjCObject/dep dependencies # GenObjCxxObject/dep dependencies +# GenNasmObject/dep dependencies # CxxClrObject/dep dependencies # GenCxxClrObject/dep dependencies # AsmObject/dep dependencies @@ -631,6 +634,32 @@ $(call gb_GenObjCxxObject_get_dep_target,%) : endif +# GenNasmObject class + +gb_GenNasmObject_get_source = $(WORKDIR)/$(1) + +$(call gb_GenNasmObject_get_target,%) : + $(call gb_Output_announce,$*,$(true),ASM,3) + $(call gb_Trace_StartRange,$*,ASM) + test -f $(call gb_GenNasmObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenNasmObject_get_source,$*)" && false) + mkdir -p $(dir $@) $(dir $(call gb_GenNasmObject_get_dep_target,$*)) && cd $(SRCDIR) && \ + $(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \ + $(call gb_GenNasmObject_get_source,$*) -o $@ && \ + echo "$@ : $(call gb_GenNasmObject_get_source,$*)" > $(call gb_GenNasmObject_get_dep_target,$*) + $(call gb_Trace_EndRange,$*,ASM) + +ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_GenNasmObject_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_GenNasmObject_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_GenNasmObject_get_dep_target,%) : + $(if $(wildcard $@),touch $@) + +endif + # CxxClrObject class # @@ -720,6 +749,9 @@ $(WORKDIR)/Clean/LinkTarget/% : $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_dep_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_dwo_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_dep_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_dwo_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_dep_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_dwo_target,$(object))) \ @@ -753,6 +785,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_dep_target,$(object))) \ $(foreach object,$(GENOBJCOBJECTS),$(call gb_GenObjCObject_get_dep_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_dep_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_dep_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_dep_target,$(object))) \ ) && \ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \ @@ -774,6 +807,7 @@ TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENOBJCOBJECTS),$(call gb_GenObjCObject_get_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_target,$(object))) \ $(PCHOBJS) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) && \ @@ -922,6 +956,8 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : GENOBJCOBJECTS := $(call gb_LinkTarget_get_clean_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : GENNASMOBJECTS := +$(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : GENOBJCXXOBJECTS := $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : GENCXXCLROBJECTS := @@ -935,6 +971,8 @@ $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXX $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND := +$(call gb_LinkTarget_get_target,$(1)) : T_NASMFLAGS := $$(NAFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_NASMFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : T_CXXCLRFLAGS := $$(gb_LinkTarget_CXXCLRFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_CXXCLRFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) @@ -989,6 +1027,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENOBJCOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENOBJCXXOBJECTS := +$(call gb_LinkTarget_get_dep_target,$(1)) : GENNASMOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXCLROBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS := endif @@ -1037,6 +1076,11 @@ $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2) endef +# call gb_LinkTarget_add_nasmflags,linktarget,nasmflags +define gb_LinkTarget_add_nasmflags +$(call gb_LinkTarget_get_target,$(1)) : T_NASMFLAGS_APPEND += $(2) +endef + # call gb_LinkTarget_add_cxxclrflags,linktarget,cxxclrflags define gb_LinkTarget_add_cxxclrflags $(call gb_LinkTarget_get_target,$(1)) : T_CXXCLRFLAGS_APPEND += $(2) @@ -1496,6 +1540,30 @@ endif endef +# call gb_LinkTarget_add_generated_nasm_object,linktarget,sourcefile,nasmflags,linktargetmakefilename +define gb_LinkTarget_add_generated_nasm_object +$(call gb_LinkTarget_get_target,$(1)) : GENNASMOBJECTS += $(2) +$(call gb_LinkTarget_get_clean_target,$(1)) : GENNASMOBJECTS += $(2) + +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenNasmObject_get_target,$(2)) +$(call gb_GenNasmObject_get_target,$(2)) : $(call gb_GenNasmObject_get_source,$(2)) +# Often gb_GenNasmObject_get_source does not have its own rule and is only a byproduct. +# That's why we need this order-only dependency on gb_Helper_MISCDUMMY +$(call gb_GenNasmObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY) +$(call gb_GenNasmObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenNasmObject_get_target,$(2)) : T_NASMFLAGS += $(call gb_LinkTarget__get_nasmflags,$(4)) $(3) +$(call gb_GenNasmObject_get_target,$(2)) : \ + OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) + +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : GENNASMOBJECTS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenNasmObject_get_dep_target,$(2)) +$(call gb_GenNasmObject_get_dep_target,$(2)) :| $(dir $(call gb_GenNasmObject_get_dep_target,$(2))).dir +$(call gb_GenNasmObject_get_target,$(2)) :| $(dir $(call gb_GenNasmObject_get_dep_target,$(2))).dir +endif + +endef + # call gb_LinkTarget_add_generated_objcxx_object,linktarget,sourcefile,cflags,linktargetmakefilename define gb_LinkTarget_add_generated_objcxx_object $(call gb_LinkTarget_get_target,$(1)) : GENOBJCXXOBJECTS += $(2) @@ -1682,6 +1750,11 @@ define gb_LinkTarget_add_generated_objcxxobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_objcxx_object,$(1),$(obj),$(3),$(4))) endef +# call gb_LinkTarget_add_generated_nasmobjects,linktarget,sourcefiles,cflags,linktargetmakefilename +define gb_LinkTarget_add_generated_nasmobjects +$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_nasm_object,$(1),$(obj),$(3),$(4))) +endef + # call gb_LinkTarget_add_generated_cxxclrobjects,linktarget,sourcefiles,cxxclrflags,linktargetmakefilename define gb_LinkTarget_add_generated_cxxclrobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxxclrobject,$(1),$(obj),$(3),$(4))) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index dd55f468fcca..37fcf2b46130 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -88,10 +88,12 @@ gb_StaticLibrary_add_x64_generated_cobjects = $(call gb_StaticLibrary__forward_t gb_StaticLibrary_add_generated_exception_objects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_objcobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_objcxxobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) +gb_StaticLibrary_add_generated_nasmobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_cflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_cxxflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_objcflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_objcxxflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) +gb_StaticLibrary_add_nasmflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_cxxclrflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_defs = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_set_include = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 62deb5122ec0..2559dddd46ef 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -64,6 +64,8 @@ gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o gb_CxxObject_get_dwo_target = $(WORKDIR)/CxxObject/$(1).dwo gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o gb_GenCxxObject_get_dwo_target = $(WORKDIR)/GenCxxObject/$(1).dwo +gb_GenNasmObject_get_target = $(WORKDIR)/GenNasmObject/$(1).o +gb_GenNasmObject_get_dwo_target = $(WORKDIR)/GenNasmObject/$(1).dwo gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1) gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt @@ -331,6 +333,7 @@ $(eval $(call gb_Helper_make_dep_targets,\ GenCxxObject \ GenObjCObject \ GenObjCxxObject \ + GenNasmObject \ GenCxxClrObject \ SdiTarget \ )) diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index d6f4ce42024b..fde207eccf4d 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -38,6 +38,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ $(T_LIBS) \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index ad1bb2561262..0fff6a2caf20 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -230,6 +230,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(CXXCLROBJECTS),$(call gb_CxxClrObject_get_target,$(object))) \ $(foreach object,$(GENCXXCLROBJECTS),$(call gb_GenCxxClrObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ $(PCHOBJS) $(NATIVERES)) && \ $(if $(filter $(call gb_Library__get_workdir_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \ diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index 95c5461409eb..15f1ce4ef4ac 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -97,6 +97,7 @@ define gb_LinkTarget__command_dynamiclink $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ @@ -117,6 +118,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5aeb3a95ce86..34738b531ad3 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -107,6 +107,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach object,$(GENOBJCOBJECTS),$(call gb_GenObjCObject_get_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) && \ @@ -151,6 +152,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach object,$(GENOBJCOBJECTS),$(call gb_GenObjCObject_get_target,$(object))) \ $(foreach object,$(GENOBJCXXOBJECTS),$(call gb_GenObjCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 8ce19bc9ae27..e0ffc0d6df0b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -122,6 +122,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group \ $(foreach lib,$(LINKED_STATIC_LIBS),\ @@ -150,6 +151,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 6fbe4002e883..644301ac21b9 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -127,6 +127,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ -Wl$(COMMA)--start-group \ @@ -166,6 +167,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENNASMOBJECTS),$(call gb_GenNasmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) endef |