0683dde5d3
cargo-xwin drives the Windows MSVC cross-compile via clang-cl, under which CMake sets MSVC=1 — causing libopus 1.3.1's `if(NOT MSVC)` guards to skip the per-file `-msse4.1` / `-mssse3` COMPILE_FLAGS that its x86 SIMD source files need. Clang-cl (unlike real cl.exe) still honors Clang's target-feature system, so those files then fail to compile with "always_inline function '_mm_cvtepi16_epi32' requires target feature 'sse4.1'" errors across silk/NSQ_sse4_1.c, NSQ_del_dec_sse4_1.c, and VQ_WMat_EC_sse4_1.c. Earlier attempts to fix this downstream (cargo-xwin toolchain file, override.cmake CMAKE_C_COMPILE_OBJECT <FLAGS> replace, CFLAGS env vars) all failed because cargo-xwin rewrites override.cmake from scratch on every `cargo xwin build` invocation and cmake-rs's -DCMAKE_C_FLAGS= assembly happens before toolchain FORCE sets propagate. Fixing it upstream at the source: vendor audiopus_sys 0.2.2 into vendor/audiopus_sys, patch its bundled opus/CMakeLists.txt to introduce an MSVC_CL var (true only when CMAKE_C_COMPILER_ID == "MSVC", i.e. real cl.exe), and flip the eight `if(NOT MSVC)` SIMD guards to `if(NOT MSVC_CL)`. Clang-cl then gets the GCC-style per-file flags and the SSE4.1 sources build cleanly. Also flip the `if(MSVC)` global /arch block at line 445 to `if(MSVC_CL)` so only cl.exe applies /arch:AVX and clang-cl relies purely on per-file flags (no global/per-file mixing). Wire via [patch.crates-io] in the workspace root Cargo.toml; the patch is resolved relative to the workspace root as `vendor/audiopus_sys`. Upstream context: xiph/opus#256, xiph/opus PR #257 (both stale). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
86 lines
3.0 KiB
C
86 lines
3.0 KiB
C
/* Copyright (c) 2011 Xiph.Org Foundation
|
|
Written by Gregory Maxwell */
|
|
/*
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
|
|
- Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions and the following disclaimer.
|
|
|
|
- Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
static OPUS_INLINE void deb2_impl(unsigned char *_t,unsigned char **_p,int _k,int _x,int _y)
|
|
{
|
|
int i;
|
|
if(_x>2){
|
|
if(_y<3)for(i=0;i<_y;i++)*(--*_p)=_t[i+1];
|
|
}else{
|
|
_t[_x]=_t[_x-_y];
|
|
deb2_impl(_t,_p,_k,_x+1,_y);
|
|
for(i=_t[_x-_y]+1;i<_k;i++){
|
|
_t[_x]=i;
|
|
deb2_impl(_t,_p,_k,_x+1,_x);
|
|
}
|
|
}
|
|
}
|
|
|
|
/*Generates a De Bruijn sequence (k,2) with length k^2*/
|
|
static OPUS_INLINE void debruijn2(int _k, unsigned char *_res)
|
|
{
|
|
unsigned char *p;
|
|
unsigned char *t;
|
|
t=malloc(sizeof(unsigned char)*_k*2);
|
|
memset(t,0,sizeof(unsigned char)*_k*2);
|
|
p=&_res[_k*_k];
|
|
deb2_impl(t,&p,_k,1,1);
|
|
free(t);
|
|
}
|
|
|
|
/*MWC RNG of George Marsaglia*/
|
|
static opus_uint32 Rz, Rw;
|
|
static OPUS_INLINE opus_uint32 fast_rand(void)
|
|
{
|
|
Rz=36969*(Rz&65535)+(Rz>>16);
|
|
Rw=18000*(Rw&65535)+(Rw>>16);
|
|
return (Rz<<16)+Rw;
|
|
}
|
|
static opus_uint32 iseed;
|
|
|
|
#ifdef __GNUC__
|
|
__attribute__((noreturn))
|
|
#elif defined(_MSC_VER)
|
|
__declspec(noreturn)
|
|
#endif
|
|
static OPUS_INLINE void _test_failed(const char *file, int line)
|
|
{
|
|
fprintf(stderr,"\n ***************************************************\n");
|
|
fprintf(stderr," *** A fatal error was detected. ***\n");
|
|
fprintf(stderr," ***************************************************\n");
|
|
fprintf(stderr,"Please report this failure and include\n");
|
|
fprintf(stderr,"'make check SEED=%u fails %s at line %d for %s'\n",iseed,file,line,opus_get_version_string());
|
|
fprintf(stderr,"and any relevant details about your system.\n\n");
|
|
#if defined(_MSC_VER)
|
|
_set_abort_behavior( 0, _WRITE_ABORT_MSG);
|
|
#endif
|
|
abort();
|
|
}
|
|
#define test_failed() _test_failed(__FILE__, __LINE__);
|
|
|
|
void regression_test(void);
|