atomic patch from icedtea8

diff --git a/atomic.patch b/atomic.patch
new file mode 100644 (file)
index 0000000..cb1d458
--- /dev/null
+++ b/atomic.patch
@@ -0,0 +1,12 @@
+--- openjdk/hotspot/make/linux/makefiles/vm.make.orig  2021-01-06 14:05:49.577018554 +0100
++++ openjdk/hotspot/make/linux/makefiles/vm.make       2021-01-06 15:00:35.642849516 +0100
+@@ -297,6 +297,9 @@
+     LIBS_VM                += $(STATIC_STDCXX)
+   else
+     LIBS_VM                += -lstdc++
++    ifeq ($(BUILDARCH), aarch32)
++      LIBS_VM                += -latomic
++    endif
+   endif
+ 
+   LIBS_VM                  += $(LIBS)

diff --git a/openjdk8.spec b/openjdk8.spec
index 4d43f6fe3793a1a8d1c29e477e7ee7a774175c93..179aaf7abb17a5dd361cdba771b7ac9a8542ab4a 100644 (file)
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -55,6 +55,7 @@ Patch8:               x32.patch
 Patch9:                gcc11.patch
 Patch10:       link-with-as-needed.patch
 Patch11:       aarch32.patch
 Patch9:                gcc11.patch
 Patch10:       link-with-as-needed.patch
 Patch11:       aarch32.patch

+Patch12:       atomic.patch

 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel
 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel


@@ -70,6 +71,9 @@ BuildRequires:        giflib-devel >= 5.1
 BuildRequires: glibc-misc
 %buildrequires_jdk
 BuildRequires: lcms2-devel
 BuildRequires: glibc-misc
 %buildrequires_jdk
 BuildRequires: lcms2-devel

+%ifarch %{arm}
+BuildRequires: libatomic-devel
+%endif

 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: lsb-release
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: lsb-release


@@ -445,6 +449,7 @@ done
 %patch10 -p1
 %ifarch %{arm}
 %patch11 -p1
 %patch10 -p1
 %ifarch %{arm}
 %patch11 -p1

+%patch12 -p1

 %endif
 
 %build
 %endif
 
 %build