Bug 1760484 - Add webrtc configs for arm64 openbsd. r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D149473
This commit is contained in:
Mike Hommey 2022-06-21 20:03:56 +00:00
Родитель 9b1024c681
Коммит 0985192f22
6 изменённых файлов: 80 добавлений и 30 удалений

Просмотреть файл

@ -654,7 +654,7 @@ def main():
for is_debug in (True, False):
for target_os in ("android", "linux", "mac", "openbsd", "win"):
target_cpus = ["x64"]
if target_os in ("android", "linux", "mac", "win"):
if target_os in ("android", "linux", "mac", "win", "openbsd"):
target_cpus.append("arm64")
if target_os in ("android", "linux"):
target_cpus.append("arm")

Просмотреть файл

@ -91,6 +91,19 @@ if CONFIG["OS_TARGET"] == "Linux":
"rt"
]
if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["USE_GLIB"] = "1"
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@ -146,6 +159,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"

Просмотреть файл

@ -90,6 +90,19 @@ if CONFIG["OS_TARGET"] == "Linux":
"rt"
]
if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["USE_GLIB"] = "1"
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@ -145,6 +158,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"

Просмотреть файл

@ -88,10 +88,6 @@ if CONFIG["OS_TARGET"] == "Linux":
if CONFIG["OS_TARGET"] == "OpenBSD":
CXXFLAGS += [
"-msse2"
]
DEFINES["USE_GLIB"] = "1"
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_BSD"] = True
@ -102,10 +98,6 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@ -168,6 +160,12 @@ if CONFIG["CPU_ARCH"] == "x86":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["CPU_ARCH"] == "x86_64":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
DEFINES["_DEBUG"] = True
@ -216,20 +214,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
"-msse2"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
CXXFLAGS += [
"-msse2"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
@ -255,14 +245,10 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
CXXFLAGS += [
"-msse2"
]
Library("fft_size_128_gn")

Просмотреть файл

@ -81,6 +81,19 @@ if CONFIG["OS_TARGET"] == "Linux":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["USE_GLIB"] = "1"
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@ -129,6 +142,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["_DEBUG"] = True
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"

25
third_party/libwebrtc/moz.build поставляемый
Просмотреть файл

@ -389,16 +389,11 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
DIRS += [
"/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
"/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
"/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
"/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
"/third_party/libwebrtc/modules/audio_coding/isac_gn",
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
]
if CONFIG["OS_TARGET"] == "WINNT":
@ -562,6 +557,24 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
"/third_party/libwebrtc/common_audio/common_audio_neon_gn",
"/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
]
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
"/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
"/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
DIRS += [