diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index 8bf06da039f353d141bd27d727e49b4f6baf86bd..4f6e149e086452bed0dbb672afff4396c9cc6b0b 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -1213,7 +1213,6 @@ BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 # elfutils only are OK for build without AOT
 BuildRequires: elfutils-devel
-BuildRequires: elfutils-extra
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 BuildRequires: giflib-devel
@@ -1870,7 +1869,7 @@ done
 
 # Make sure gdb can do a backtrace based on line numbers on libjvm.so
 # javaCalls.cpp:58 should map to:
-# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 
+# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58
 # Using line number 1 might cause build problems.
 gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
 handle SIGSEGV pass nostop noprint
@@ -1963,7 +1962,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix}/lib/%{archinstall}/clien
   # Install demos and samples.
   cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
   mkdir -p sample/rmi
-  if [ ! -e sample/rmi/java-rmi.cgi ] ; then 
+  if [ ! -e sample/rmi/java-rmi.cgi ] ; then
     # hack to allow --short-circuit on install
     mv bin/java-rmi.cgi sample/rmi
   fi
@@ -2076,11 +2075,11 @@ for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.
 done
 
 # stabilize permissions
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 755 {} \; ; 
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ; 
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "ASSEMBLY_EXCEPTION" -exec chmod 644 {} \; ; 
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "LICENSE" -exec chmod 644 {} \; ; 
-find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "THIRD_PARTY_README" -exec chmod 644 {} \; ; 
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 755 {} \; ;
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ;
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "ASSEMBLY_EXCEPTION" -exec chmod 644 {} \; ;
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "LICENSE" -exec chmod 644 {} \; ;
+find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "THIRD_PARTY_README" -exec chmod 644 {} \; ;
 
 # end, dual install
 done
@@ -2403,7 +2402,7 @@ cjc.mainProgram(arg)
 - modified implementation_of_Blas_hotspot_function_in_Intrinsics.patch
 
 * Tue Feb 15 2022 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.322-b06.1
-- fix makes failure when gcc version is lower than 8 
+- fix makes failure when gcc version is lower than 8
 
 * Thu Feb 10 2022 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.322-b06.0
 - upgrade to 8u322-b06(ga)
@@ -2679,7 +2678,7 @@ cjc.mainProgram(arg)
 
 * Tue Nov 10 2020 ow_wo <fengshijie2@huawei.com> - 1:1.8.0.272-b10.6
 - add 8236512-PKCS11-Connection-closed-after-Cipher.doFinal-and-NoPadding.patch
-- add 8250861-Crash-in-MinINode-Ideal-PhaseGVN-bool.patch 
+- add 8250861-Crash-in-MinINode-Ideal-PhaseGVN-bool.patch
 
 * Mon Nov 09 2020 ow_wo <fengshijie2@huawei.com> - 1:1.8.0.272-b10.5
 - add 8223940-Private-key-not-supported-by-chosen-signature.patch
@@ -2757,7 +2756,7 @@ cjc.mainProgram(arg)
 - Add Ddot-intrinsic-implement.patch
 - Add 8234003-Improve-IndexSet-iteration.patch
 - Add 8220159-Optimize-various-RegMask-operations-by-introducing-watermarks.patch
-- Remove prohibition-of-irreducible-loop-in-mergers.patch 
+- Remove prohibition-of-irreducible-loop-in-mergers.patch
 
 * Tue Aug 25 2020 noah <hedongbo@huawei.com> - 1:1.8.0.265-b10.0
 - Update to aarch64-shenandoah-jdk8u-8u265-b01