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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/fix-arm32-build.patch
--- old/buildSrc/linux.gradle
+++ new/buildSrc/linux.gradle
@@ -46,10 +46,6 @@
"-fstack-protector",
"-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
-if (!IS_64) {
- commonFlags += "-m32"
-}
-
// Specify the compilation parameters and link parameters
def ccFlags = [
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
@@ -287,20 +283,12 @@
LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
LINUX.launcher.linker = linker
LINUX.launcher.linkFlags = ["-ldl"]
-if (!IS_64) {
- LINUX.launcher.ccFlags += "-m32"
- LINUX.launcher.linkFlags += "-m32"
-}
LINUX.launcherlibrary = [:]
LINUX.launcherlibrary.compiler = compiler
LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98", "-ffunction-sections", "-fdata-sections"]
LINUX.launcherlibrary.linker = linker
LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
-if (!IS_64) {
- LINUX.launcherlibrary.ccFlags += "-m32"
- LINUX.launcherlibrary.linkFlags += "-m32"
-}
LINUX.iio = [:]
LINUX.iio.nativeSource = [
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -63,11 +63,6 @@
LDFLAGS += $(shell pkg-config --libs libavcodec libavformat)
endif
-ifeq ($(ARCH), x32)
- CFLAGS += -m32
- LDFLAGS += -m32
-endif
-
SOURCES = av/fxavcodecplugin.c \
av/avelement.c \
av/decoder.c \
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -54,11 +54,6 @@
-z relro \
-static-libgcc -static-libstdc++ -Wl,--gc-sections
-ifeq ($(ARCH), x32)
- CFLAGS += -m32
- LDFLAGS += -m32
-endif
-
SOURCES = fxplugins.c \
progressbuffer/progressbuffer.c \
progressbuffer/hlsprogressbuffer.c \
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -79,11 +79,6 @@
-z relro \
-static-libgcc -static-libstdc++ -Wl,--gc-sections
-ifeq ($(ARCH), x32)
- CFLAGS += -m32
- LDFLAGS += -m32
-endif
-
SOURCES = \
gstreamer/gst/gst.c \
gstreamer/gst/gstallocator.c \
--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -74,11 +74,6 @@
CFLAGS += -g -Wall -D_DEBUG
endif
-ifeq ($(ARCH), x32)
- CFLAGS += -m32
- LDFLAGS += -m32
-endif
-
CPP_SOURCES = \
jni/com_sun_media_jfxmedia_logging_Logger.cpp \
jni/JavaBandsHolder.cpp \
|
