- rename n_no-sse2-on-ix86.patch to
n_no-sse2-on-ix86-except-for-intel-drivers.patch
* no longer disable sse2 support for intel drivers, since this
breaks build, which is probably unresolvable (boo1190409)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1077
This commit is contained in:
Git OBS Bridge
parent
bf4320f8a7
commit
4ebb363659
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
- rename n_no-sse2-on-ix86.patch to
|
||||||
|
n_no-sse2-on-ix86-except-for-intel-drivers.patch
|
||||||
|
* no longer disable sse2 support for intel drivers, since this
|
||||||
|
breaks build, which is probably unresolvable (boo1190409)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -135,7 +135,7 @@ Patch58: u_dep_xcb.patch
|
|||||||
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
||||||
Patch200: u_fix-build-on-ppc64le.patch
|
Patch200: u_fix-build-on-ppc64le.patch
|
||||||
Patch300: n_buildfix-21.3.0.patch
|
Patch300: n_buildfix-21.3.0.patch
|
||||||
Patch400: n_no-sse2-on-ix86.patch
|
Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
|||||||
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 8 10:21:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
- rename n_no-sse2-on-ix86.patch to
|
||||||
|
n_no-sse2-on-ix86-except-for-intel-drivers.patch
|
||||||
|
* no longer disable sse2 support for intel drivers, since this
|
||||||
|
breaks build, which is probably unresolvable (boo1190409)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
Thu Jan 6 16:34:30 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -134,7 +134,7 @@ Patch58: u_dep_xcb.patch
|
|||||||
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
||||||
Patch200: u_fix-build-on-ppc64le.patch
|
Patch200: u_fix-build-on-ppc64le.patch
|
||||||
Patch300: n_buildfix-21.3.0.patch
|
Patch300: n_buildfix-21.3.0.patch
|
||||||
Patch400: n_no-sse2-on-ix86.patch
|
Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
|||||||
41
n_no-sse2-on-ix86-except-for-intel-drivers.patch
Normal file
41
n_no-sse2-on-ix86-except-for-intel-drivers.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
diff -u -r mesa-21.3.3.orig/meson.build mesa-21.3.3/meson.build
|
||||||
|
--- mesa-21.3.3.orig/meson.build 2022-01-06 19:34:26.332485000 +0100
|
||||||
|
+++ mesa-21.3.3/meson.build 2022-01-06 19:32:11.286680000 +0100
|
||||||
|
@@ -1231,35 +1231,8 @@
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
-if host_machine.cpu_family().startswith('x86') and cc.get_id() != 'msvc'
|
||||||
|
- pre_args += '-DUSE_SSE41'
|
||||||
|
- with_sse41 = true
|
||||||
|
- sse41_args = ['-msse4.1']
|
||||||
|
-
|
||||||
|
- if host_machine.cpu_family() == 'x86'
|
||||||
|
- if get_option('sse2')
|
||||||
|
- # These settings make generated GCC code match MSVC and follow
|
||||||
|
- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note
|
||||||
|
- #
|
||||||
|
- # NOTE: We need to ensure stack is realigned given that we
|
||||||
|
- # produce shared objects, and have no control over the stack
|
||||||
|
- # alignment policy of the application. Therefore we need
|
||||||
|
- # -mstackrealign or -mincoming-stack-boundary=2.
|
||||||
|
- #
|
||||||
|
- # XXX: We could have SSE without -mstackrealign if we always used
|
||||||
|
- # __attribute__((force_align_arg_pointer)), but that's not
|
||||||
|
- # always the case.
|
||||||
|
- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign']
|
||||||
|
- else
|
||||||
|
- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but
|
||||||
|
- # that's not guaranteed
|
||||||
|
- sse41_args += '-mstackrealign'
|
||||||
|
- endif
|
||||||
|
- endif
|
||||||
|
-else
|
||||||
|
- with_sse41 = false
|
||||||
|
- sse41_args = []
|
||||||
|
-endif
|
||||||
|
+with_sse41 = false
|
||||||
|
+sse41_args = []
|
||||||
|
|
||||||
|
# Check for GCC style atomics
|
||||||
|
dep_atomic = null_dep
|
||||||
@ -1,78 +0,0 @@
|
|||||||
diff -u -r mesa-21.3.3.orig/meson.build mesa-21.3.3/meson.build
|
|
||||||
--- mesa-21.3.3.orig/meson.build 2022-01-06 19:34:26.332485000 +0100
|
|
||||||
+++ mesa-21.3.3/meson.build 2022-01-06 19:32:11.286680000 +0100
|
|
||||||
@@ -1231,35 +1231,8 @@
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
-if host_machine.cpu_family().startswith('x86') and cc.get_id() != 'msvc'
|
|
||||||
- pre_args += '-DUSE_SSE41'
|
|
||||||
- with_sse41 = true
|
|
||||||
- sse41_args = ['-msse4.1']
|
|
||||||
-
|
|
||||||
- if host_machine.cpu_family() == 'x86'
|
|
||||||
- if get_option('sse2')
|
|
||||||
- # These settings make generated GCC code match MSVC and follow
|
|
||||||
- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note
|
|
||||||
- #
|
|
||||||
- # NOTE: We need to ensure stack is realigned given that we
|
|
||||||
- # produce shared objects, and have no control over the stack
|
|
||||||
- # alignment policy of the application. Therefore we need
|
|
||||||
- # -mstackrealign or -mincoming-stack-boundary=2.
|
|
||||||
- #
|
|
||||||
- # XXX: We could have SSE without -mstackrealign if we always used
|
|
||||||
- # __attribute__((force_align_arg_pointer)), but that's not
|
|
||||||
- # always the case.
|
|
||||||
- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign']
|
|
||||||
- else
|
|
||||||
- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but
|
|
||||||
- # that's not guaranteed
|
|
||||||
- sse41_args += '-mstackrealign'
|
|
||||||
- endif
|
|
||||||
- endif
|
|
||||||
-else
|
|
||||||
- with_sse41 = false
|
|
||||||
- sse41_args = []
|
|
||||||
-endif
|
|
||||||
+with_sse41 = false
|
|
||||||
+sse41_args = []
|
|
||||||
|
|
||||||
# Check for GCC style atomics
|
|
||||||
dep_atomic = null_dep
|
|
||||||
diff -u -r mesa-21.3.3.orig/src/intel/isl/meson.build mesa-21.3.3/src/intel/isl/meson.build
|
|
||||||
--- mesa-21.3.3.orig/src/intel/isl/meson.build 2022-01-06 19:33:10.676509000 +0100
|
|
||||||
+++ mesa-21.3.3/src/intel/isl/meson.build 2022-01-06 19:40:58.929557000 +0100
|
|
||||||
@@ -99,7 +99,7 @@
|
|
||||||
inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
|
|
||||||
],
|
|
||||||
dependencies : idep_mesautil,
|
|
||||||
- c_args : [no_override_init_args, '-msse2'],
|
|
||||||
+ c_args : [no_override_init_args, ],
|
|
||||||
gnu_symbol_visibility : 'hidden',
|
|
||||||
extra_files : ['isl_tiled_memcpy.c']
|
|
||||||
)
|
|
||||||
diff -u -r mesa-21.3.3.orig/src/intel/meson.build mesa-21.3.3/src/intel/meson.build
|
|
||||||
--- mesa-21.3.3.orig/src/intel/meson.build 2022-01-06 19:33:19.801577000 +0100
|
|
||||||
+++ mesa-21.3.3/src/intel/meson.build 2022-01-06 19:46:08.372577000 +0100
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
# SOFTWARE.
|
|
||||||
|
|
||||||
-c_sse2_args = ['-msse2', '-mstackrealign']
|
|
||||||
+c_sse2_args = ['-mstackrealign']
|
|
||||||
inc_intel = include_directories('.')
|
|
||||||
|
|
||||||
subdir('genxml')
|
|
||||||
diff -u -r mesa-21.3.3.orig/src/intel/perf/meson.build mesa-21.3.3/src/intel/perf/meson.build
|
|
||||||
--- mesa-21.3.3.orig/src/intel/perf/meson.build 2022-01-06 19:33:19.957531000 +0100
|
|
||||||
+++ mesa-21.3.3/src/intel/perf/meson.build 2022-01-06 19:42:22.666599000 +0100
|
|
||||||
@@ -37,7 +37,7 @@
|
|
||||||
include_directories : [
|
|
||||||
inc_include, inc_src, inc_intel,
|
|
||||||
],
|
|
||||||
- c_args : [no_override_init_args, '-msse2'],
|
|
||||||
- cpp_args : ['-msse2'],
|
|
||||||
+ c_args : [no_override_init_args],
|
|
||||||
+ cpp_args : [],
|
|
||||||
gnu_symbol_visibility : 'hidden',
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue
Block a user