summaryrefslogtreecommitdiff
blob: 0a114b039c3eb89b143d8ebc4ec9b778cd9b6c59 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sun, 26 Apr 2020 20:57:39 -0700
Subject: [PATCH] don't force msse

---
 .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
 .../native/gstreamer/projects/linux/fxplugins/Makefile     | 1 -
 .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 -
 modules/web/src/main/native/Tools/Scripts/webkitdirs.pm    | 7 -------
 4 files changed, 10 deletions(-)

diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index df9f7f21..f82f0537 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -28,7 +28,6 @@ CFLAGS = -fPIC                   \
          -Wformat-security       \
          -Werror=implicit-function-declaration \
          -fstack-protector       \
-         -msse2                  \
          -fbuiltin               \
          -DHAVE_STDINT_H         \
          -DLINUX                 \
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index fd3847d0..3887ac6d 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -25,7 +25,6 @@ CFLAGS = -fPIC                   \
          -Wformat-security       \
          -Werror=implicit-function-declaration \
          -fstack-protector       \
-         -msse2                  \
          -fbuiltin               \
          -DHAVE_STDINT_H         \
          -DLINUX                 \
diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
index 3d089501..10fad68f 100644
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -44,7 +44,6 @@ ifdef HOST_COMPILE
                   -Wformat-security \
                   -fstack-protector \
                   -Werror=implicit-function-declaration \
-		  -msse2 \
 	          -DGSTREAMER_LITE
 
 	INCLUDES = $(BASE_INCLUDES) \
diff --git a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
index ced93727..b95062ea 100644
--- a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
+++ b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
@@ -2192,13 +2192,6 @@ sub generateBuildSystemFromCMakeProject
     my $cmakeSourceDir = isCygwin() ? windowsSourceDir() : sourceDir();
     push @args, '"' . $cmakeSourceDir . '"';
 
-    # Compiler options to keep floating point values consistent
-    # between 32-bit and 64-bit architectures.
-    determineArchitecture();
-    if ($architecture eq "i686" && !isCrossCompilation() && !isAnyWindows()) {
-        $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
-    }
-
     # We call system("cmake @args") instead of system("cmake", @args) so that @args is
     # parsed for shell metacharacters.
     my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
-- 
2.26.2