Skip to content

Avoid leaking x86_64 SSE2 paths into forced RISC-V probes #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carlosqwqqwq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid leaking x86_64 SSE2 paths into forced RISC-V probes #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ This package contains:
- libvorbisenc, a BSD-style license library that provides a simple,
programmatic encoding setup interface

- the generic scalar fallback used on non-x86 targets such as `riscv64`

- example code making use of libogg, libvorbis, libvorbisfile and
libvorbisenc

Expand Down
6 changes: 4 additions & 2 deletions lib/os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,10 @@ static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){


/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be
done safely because all x86_64 CPUs supports SSE2. */
#if (defined(_MSC_VER) && (defined(_M_X64) && !defined(_M_ARM64EC))) || (defined(__GNUC__) && defined (__SSE2_MATH__))
done safely because all x86_64 CPUs supports SSE2. Keep it gated on x86_64
only, and explicitly step aside when a forced non-x86 target probe defines
__riscv on an x86_64 host for portability smoke testing. */
#if (defined(_MSC_VER) && (defined(_M_X64) && !defined(_M_ARM64EC))) || (defined(__GNUC__) && defined(__x86_64__) && defined(__SSE2_MATH__) && !defined(__riscv))
# define VORBIS_FPU_CONTROL

typedef ogg_int16_t vorbis_fpu_control;
Expand Down