[patch] Patch in /etc/portage/patches/www-client/firefox

compiles-with-core2.patch (text/plain), 4.92 KB, created by Xavier Forestier on 2022-05-02 15:15:10 UTC

--- aaa/gfx/skia/moz.build	2022-04-29 07:41:11.538100734 +0200
+++ bbb/gfx/skia/moz.build	2022-04-29 07:42:42.235966855 +0200
@@ -412,16 +412,16 @@
     ]
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES += [
-        'skia/src/opts/SkOpts_avx.cpp',
-        'skia/src/opts/SkOpts_hsw.cpp',
-        'skia/src/opts/SkOpts_sse41.cpp',
-        'skia/src/opts/SkOpts_sse42.cpp',
+#        'skia/src/opts/SkOpts_avx.cpp',
+#        'skia/src/opts/SkOpts_hsw.cpp',
+#        'skia/src/opts/SkOpts_sse41.cpp',
+#        'skia/src/opts/SkOpts_sse42.cpp',
         'skia/src/opts/SkOpts_ssse3.cpp',
     ]
-    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += skia_opt_flags
-    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += skia_opt_flags
-    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += skia_opt_flags
-    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
+#    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += skia_opt_flags
+#    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += skia_opt_flags
+#    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += skia_opt_flags
+#    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
 elif CONFIG['CPU_ARCH'] == 'aarch64':
     SOURCES += [
@@ -451,10 +451,10 @@
 
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
-    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
-    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
-    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
-    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
+#    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
+#    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
+#    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
+#    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += CONFIG['NEON_FLAGS']
 elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
--- aaa/gfx/skia/skia/include/core/SkPreConfig.h	2022-04-30 10:47:31.053188922 +0200
+++ bbb/gfx/skia/skia/include/core/SkPreConfig.h	2022-04-30 10:48:12.583669719 +0200
@@ -117,17 +117,7 @@
 #ifndef SK_CPU_SSE_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
-    #if defined(__AVX512F__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX512
-    #elif defined(__AVX2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX2
-    #elif defined(__AVX__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX
-    #elif defined(__SSE4_2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
-    #elif defined(__SSE4_1__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
-    #elif defined(__SSSE3__)
+    #if defined(__SSSE3__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
     #elif defined(__SSE3__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3
--- aaa/gfx/skia/skia/src/core/SkOpts.cpp	2022-05-01 17:33:03.643958109 +0200
+++ bbb/gfx/skia/skia/src/core/SkOpts.cpp	2022-05-01 17:35:47.739906627 +0200
@@ -16,14 +16,6 @@
     #else
         #define SK_OPTS_NS neon
     #endif
-#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
-    #define SK_OPTS_NS avx2
-#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
-    #define SK_OPTS_NS avx
-#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE42
-    #define SK_OPTS_NS sse42
-#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
-    #define SK_OPTS_NS sse41
 #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
     #define SK_OPTS_NS ssse3
 #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE3
@@ -108,11 +100,11 @@
 
     // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
     void Init_ssse3();
-    void Init_sse41();
-    void Init_sse42();
-    void Init_avx();
-    void Init_hsw();
-    void Init_crc32();
+    //void Init_sse41();
+    //void Init_sse42();
+    //void Init_avx();
+    //void Init_hsw();
+    //void Init_crc32();
 
     static void init() {
 #if !defined(SK_BUILD_NO_OPTS)
@@ -121,22 +113,7 @@
             if (SkCpu::Supports(SkCpu::SSSE3)) { Init_ssse3(); }
         #endif
 
-        #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE41
-            if (SkCpu::Supports(SkCpu::SSE41)) { Init_sse41(); }
-        #endif
-
-        #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE42
-            if (SkCpu::Supports(SkCpu::SSE42)) { Init_sse42(); }
-        #endif
-
-        #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX
-            if (SkCpu::Supports(SkCpu::AVX)) { Init_avx();   }
-            if (SkCpu::Supports(SkCpu::HSW)) { Init_hsw();   }
-        #endif
-
-        if (SkCpu::Supports(SkCpu::HSW  )) { Init_hsw();   }
-
-    #elif defined(SK_CPU_ARM64)
+   #elif defined(SK_CPU_ARM64)
         if (SkCpu::Supports(SkCpu::CRC32)) { Init_crc32(); }
 
     #endif