Title: [263866] branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc
Revision
263866
Author
alanc...@apple.com
Date
2020-07-02 15:36:26 -0700 (Thu, 02 Jul 2020)

Log Message

Cherry-pick r263828. rdar://problem/64901603

    Fix the arm64 iOS simulator build
    https://bugs.webkit.org/show_bug.cgi?id=213868
    <rdar://problem/64901603>

    * Configurations/libvpx.xcconfig:
    * Configurations/libwebrtc.xcconfig:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/ChangeLog (263865 => 263866)


--- branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-07-02 22:31:58 UTC (rev 263865)
+++ branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-07-02 22:36:26 UTC (rev 263866)
@@ -1,3 +1,25 @@
+2020-07-02  Alan Coon  <alanc...@apple.com>
+
+        Cherry-pick r263828. rdar://problem/64901603
+
+    Fix the arm64 iOS simulator build
+    https://bugs.webkit.org/show_bug.cgi?id=213868
+    <rdar://problem/64901603>
+    
+    * Configurations/libvpx.xcconfig:
+    * Configurations/libwebrtc.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263828 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-01  Tim Horton  <timothy_hor...@apple.com>
+
+            Fix the arm64 iOS simulator build
+            https://bugs.webkit.org/show_bug.cgi?id=213868
+            <rdar://problem/64901603>
+
+            * Configurations/libvpx.xcconfig:
+            * Configurations/libwebrtc.xcconfig:
+
 2020-06-24  Youenn Fablet  <you...@apple.com>
 
         Add logging to WebRTC video pipeline to check for frame rate stability

Modified: branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (263865 => 263866)


--- branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2020-07-02 22:31:58 UTC (rev 263865)
+++ branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2020-07-02 22:36:26 UTC (rev 263866)
@@ -19,7 +19,6 @@
 ARM_FILES = *_neon.c arm_cpudetect.c *_arm.c
 X86_FILES = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *.asm
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=x86_64] = $(ARM_FILES) sad.c
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=arm64*] = $(X86_FILES)
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=arm64*] = $(X86_FILES)
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(X86_FILES) $(ARM_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[arch=x86_64] = $(ARM_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = $(X86_FILES) *_mmx.c
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=x86_64] = $(ARM_FILES) $(X86_FILES)

Modified: branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (263865 => 263866)


--- branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2020-07-02 22:31:58 UTC (rev 263865)
+++ branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2020-07-02 22:36:26 UTC (rev 263866)
@@ -38,6 +38,7 @@
 
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to