Changeset 263866 in webkit

Timestamp:

Jul 2, 2020, 3:36:26 PM (6 years ago)

Author:

Alan Coon

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

Location:

branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Configurations/libvpx.xcconfig (modified) (1 diff)
• Configurations/libwebrtc.xcconfig (modified) (1 diff)

branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2020-07-02  Alan Coon  <alancoon@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_horton@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  <youenn@apple.com>
 

branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig

@@ -20 +20 @@
 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)

branches/safari-610.1.20-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

@@ -39 +39 @@
 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);