diff --git a/gcc-5.2.0-libjava-disable-multilib.patch b/gcc-5.2.0-libjava-disable-multilib.patch
deleted file mode 100644
index a050e35..0000000
--- a/gcc-5.2.0-libjava-disable-multilib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-5.2.0/Makefile.in.orig	2015-08-16 18:06:23.099725324 +0200
-+++ gcc-5.2.0/Makefile.in	2015-08-16 18:06:33.553684921 +0200
-@@ -43118,7 +43118,7 @@
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--	  --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \
-+	  --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) --disable-multilib \
- 	  || exit 1
- @endif target-libjava
- 
diff --git a/gcc-6.1.0-gcj-remove-minor-handling.patch b/gcc-6.1.0-gcj-remove-minor-handling.patch
deleted file mode 100644
index 8551128..0000000
--- a/gcc-6.1.0-gcj-remove-minor-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- gcc-6.1.0/gcc/java/decl.c.orig	2016-02-08 16:36:16.000000000 +0100
-+++ gcc-6.1.0/gcc/java/decl.c	2016-05-08 13:57:25.854163381 +0200
-@@ -507,7 +507,7 @@
- parse_version (void)
- {
-   const char *p = version_string;
--  unsigned int major = 0, minor = 0;
-+  unsigned int major = 0;
-   unsigned int abi_version;
- 
-   /* Skip leading junk.  */
-@@ -525,13 +525,6 @@
-   gcc_assert (*p == '.' && ISDIGIT (p[1]));
-   ++p;
- 
--  /* Extract minor version.  */
--  while (ISDIGIT (*p))
--    {
--      minor = minor * 10 + *p - '0';
--      ++p;
--    }
--
-   if (flag_indirect_dispatch)
-     {
-       abi_version = GCJ_CURRENT_BC_ABI_VERSION;
---- gcc-6.1.0/gcc/java/decl.c.orig	2016-05-08 17:15:16.964134546 +0200
-+++ gcc-6.1.0/gcc/java/decl.c	2016-05-08 17:15:25.304134521 +0200
-@@ -535,7 +535,7 @@
-       /* Implicit in this computation is the idea that we won't break the
- 	 old-style binary ABI in a sub-minor release (e.g., from 4.0.0 to
- 	 4.0.1).  */
--      abi_version = 100000 * major + 1000 * minor;
-+      abi_version = 100000 * major;
-     }
-   if (flag_bootstrap_classes)
-     abi_version |= FLAG_BOOTSTRAP_LOADER;
diff --git a/gcc.spec b/gcc.spec
index f925143..0f13066 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -29,24 +29,19 @@
    %define disable_go 1
 %endif
 
-# Java support remove since gcc 7.1
-%define disable_java 1
-
 #% if "%{?stage2}" == "1"
 #   % define bootstrap_append    -stage2
 #% endif
 
 %define libstdcxx_name        libstdc++6
-%define libgcj_name           libgcj4
-%define java_home             %{_jvmdir}/java-1.5.0-gcj-1.5.0.0/jre
 
 %define MAJver %(echo %version | cut -d. -f 1)
 %define majver %(echo %version | cut -d. -f 1-2)
 
 Name:          gcc
 Version:       8.3.0
-Release:       1mamba
-Summary:       GNU Compiler Collection (C, C++, Fortran, Java, Ada)
+Release:       3mamba
+Summary:       GNU Compiler Collection (C, C++, Fortran, Go, Ada)
 Group:         Applications/Development
 Vendor:        openmamba
 Distribution:  openmamba
@@ -71,8 +66,6 @@ Patch13:       %{name}-4.5.3-avr-new-devices.patch
 Patch14:       gcc-4.8.0-libffi-texinfo.patch
 Patch15:       gcc-4.9.0-upstream-fixes-1.patch
 Patch16:       gcc-4.9.2-arm-lra-bootstrap.patch
-Patch17:       gcc-5.2.0-libjava-disable-multilib.patch
-Patch18:       gcc-6.1.0-gcj-remove-minor-handling.patch
 Patch19:       gcc-7.1.0-cross-ftbfs-ucontet_t.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
@@ -116,11 +109,6 @@ BuildRequires: libalsa-devel >= 1.0.11
 BuildRequires: dssi-devel >= 0.9
 BuildRequires: libjack-devel >= 0.101.1
 %endif
-%if "%{?disable_java}" != "1"
-BuildRequires: zip
-BuildRequires: fastjar
-BuildRequires: jpackage-utils
-%endif
 %if "%{?disable_gjdoc}" != "1"
 BuildRequires: antlr
 %endif
@@ -237,42 +225,6 @@ Requires:      libcc1 = %{version}-%{release}
 %description -n libcc1-devel
 GCC cc1 plugin for GDB development files.
 
-#
-# Java Compiler
-#
-%package java
-Summary:       Java support for gcc
-Group:         Applications/Development
-Requires:      %{libgcj_name} >= %{version}
-Requires:      %{libgcj_name}-devel >= %{version}
-Provides:      gjdoc
-Obsoletes:     gjdoc
-Obsoletes:     %{name}-java-tools
-
-%description java
-This package adds experimental support for compiling Java(tm) programs and bytecode into native code. To use this you will also need the libgcj4 package.
-
-#
-# Java Libraries
-#
-%package -n %{libgcj_name} 
-Summary:       GNU Java runtime libraries
-Group:         System/Libraries
-Provides:      libgcj
-
-%description -n %{libgcj_name}
-Runtime libraries for the GNU Java Compiler. The %{libgcj_name} includes parts of the Java Class Libraries, plus glue to connect the libraries to the compiler and the underlying OS.
-
-%package -n %{libgcj_name}-devel
-Summary:       Header files and libraries for Java development
-Group:         Development/Libraries
-Requires:      %{libgcj_name} = %{version}-%{release}
-Provides:      libgcj-devel
-
-%description -n %{libgcj_name}-devel
-Development headers and libraries for the GNU Java Compiler. 
-The %{libgcj_name} includes parts of the Java Class Libraries, plus glue to connect the libraries to the compiler and the underlying OS.
-
 #
 # Fortran 95 Compiler
 #
@@ -551,7 +503,6 @@ Cross Platform gcc for %{_target_platform}.
 #-D -T
 #:<< ___EOF
 #%patch2 -p0
-#sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in}
 
 #%patch0 -p1
 #%patch1 -p1
@@ -572,8 +523,6 @@ Cross Platform gcc for %{_target_platform}.
 #%patch14 -p1
 #%patch15 -p1
 #%patch16 -p1
-#%patch17 -p1
-#%patch18 -p1
 #%patch19 -p1
 
 %ifarch arm
@@ -604,10 +553,6 @@ BUILD_LANGUAGES="${BUILD_LANGUAGES},c++,obj-c++"
 # Fortran won't build cross platform (?)
 BUILD_LANGUAGES="${BUILD_LANGUAGES},fortran"
 %endif
-%if "%{disable_java}" != "1"
-# Java depends on gdk
-BUILD_LANGUAGES="${BUILD_LANGUAGES},java"
-%endif
 %if "%{disable_go}" != "1"
 BUILD_LANGUAGES="${BUILD_LANGUAGES},go"
 %endif
@@ -635,7 +580,7 @@ case %{_target_platform} in
       ;;
    x86_64-*)
        %if "%{_target_platform}" != "%{_host}"
-          ADDITIONAL_OPTS="--disable-libjava-multilib --with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib"
+          ADDITIONAL_OPTS="--with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib"
        %else
           ADDITIONAL_OPTS="--with-slibdir=$slibdir"
        %endif
@@ -693,11 +638,6 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \
    --enable-clocale=gnu \
    --x-includes=%{_includedir} \
    --x-libraries=%{_libdir} \
-%if "%{disable_java}" != "1"
-   --enable-java-awt=gtk \
-   --with-java-home=%{java_home} \
-   --enable-libgcj-multifile \
-%endif
    --with-system-zlib \
 %if "%{?disable_jack}" == "1"
    --disable-dssi \
@@ -754,6 +694,9 @@ for p in gcc gcc-ar gcc-nm gcc-ranlib cc gcov c++ g++ gfortran; do
    ln -s $p %{buildroot}%{_bindir}/%{_target_platform}-$p
 done
 
+install -d -m755 %{buildroot}%{_libdir}/bfd-plugins
+ln -sf ../../libexec/gcc/%{_target_platform}/%{version}/liblto_plugin.so %{buildroot}%{_libdir}/bfd-plugins/
+
 # create symlinks
 #   mkdir -p %{buildroot}/%{_lib}
 #   ln -s ../usr/bin/cpp %{buildroot}/%{_lib}/cpp
@@ -763,25 +706,6 @@ ln -s gcc %{buildroot}/usr/bin/cc
 #
 # Documentation
 #
-%if "%{disable_java}" != "1"
-mkdir -p ../gcc-%{version}%{?gcc_extraver}/rpm.doc/boehm-gc
-mkdir -p ../gcc-%{version}%{?gcc_extraver}/rpm.doc/libjava
-#(cd ../gcc-%{version}%{?gcc_extraver}/boehm-gc; for i in ChangeLog*; do
-#   cp -p $i ../rpm.doc/boehm-gc/$i.gc
-#done)
-(cd ../gcc-%{version}%{?gcc_extraver}/libjava; for i in README THANKS COPYING ChangeLog; do
-   cp -p $i ../rpm.doc/libjava/$i.libjava
-done)
-(cd ../gcc-%{version}%{?gcc_extraver}/libjava;
-   cp -p LIBGCJ_LICENSE ../rpm.doc/libjava/LICENSE.libjava)
-
-make DESTDIR=%{buildroot} -C %{_target_platform}/libjava install-src.zip
-
-# FIXME: install precompiled ecj library (should come from Eclipse that is
-#        currently missing in the distribution
-install -m0755 %{SOURCE1} %{buildroot}%{_datadir}/java/ecj.jar
-install -m0755 %{SOURCE2} %{buildroot}%{_bindir}/ecj1
-%endif
 #
 # PDF gfortran documentation
 #
@@ -847,9 +771,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %post -n %{libstdcxx_name} -p /sbin/ldconfig
 %postun -n %{libstdcxx_name} -p /sbin/ldconfig
 
-%post -n %{libgcj_name} -p /sbin/ldconfig
-%postun -n %{libgcj_name} -p /sbin/ldconfig
-
 %post -n libgfortran -p /sbin/ldconfig
 %postun -n libgfortran -p /sbin/ldconfig
 
@@ -870,9 +791,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %install_info gcc.info
 %install_info gccinstall.info
 %install_info gccint.info
-%if "%{disable_java}" != "1"
-%install_info gcj.info
-%endif
 %if "%{disable_fortran}" != "1"
 %install_info gfortran.info
 %endif
@@ -883,7 +801,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %uninstall_info gcc.info
 %uninstall_info gccinstall.info
 %uninstall_info gccint.info
-%uninstall_info gcj.info
 %uninstall_info gfortran.info
 :
 
@@ -917,7 +834,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %endif
 %dir %{_prefix}/libexec/gcc/%{_target_platform}/%{version}
 %{_prefix}/libexec/gcc/%{_target_platform}/%{version}/*
-
+%{_libdir}/bfd-plugins/liblto_plugin.so
 %{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py
 %{_datadir}/gcc-%{version}/python/libstdcxx/v6/__init__.py
 %{_datadir}/gcc-%{version}/python/libstdcxx/v6/printers.py
@@ -931,15 +848,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %doc gcc/{README*,*ChangeLog*}
 %exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/objc
 %exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp
-%if "%{disable_java}" != "1"
-%if "%{_target_platform}" == "%{_build}"
-%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/gcj/libgcj-config.h
-%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/jawt.h
-%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/jawt_md.h
-%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/jni.h
-%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/jvmpi.h
-%endif
-%endif
 
 %files -n libgcc
 %defattr(-,root,root)
@@ -1185,173 +1093,9 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %endif
 %dir %{_includedir}/c++
 %{_includedir}/c++/*
-%if "%{disable_java}" != "1"
-%if "%{_target_platform}" == "%{_build}"
-%exclude %{_includedir}/c++/%{version}/gcj/*
-%exclude %{_includedir}/c++/%{version}/gnu/awt/*
-%exclude %{_includedir}/c++/%{version}/gnu/classpath/*
-%exclude %{_includedir}/c++/%{version}/gnu/gcj/*
-%exclude %{_includedir}/c++/%{version}/gnu/java/*
-%exclude %{_includedir}/c++/%{version}/java/*
-%exclude %{_includedir}/c++/%{version}/javax/*
-%endif
-%endif
 #%doc libstdc++-v3/{ChangeLog*,README*,doc/html/}
 %endif "%{disable_cpp}
 
-%if "%{disable_java}" != "1"
-#
-# Java language
-#
-%files java
-%defattr(-,root,root)
-#%{_bindir}/addr2name.awk
-%{_bindir}/aot-compile
-%{_bindir}/ecj1
-%{_bindir}/gcj
-%{_bindir}/gcjh
-%{_bindir}/jcf-dump
-#%{_bindir}/jv-scan
-#%{_bindir}/%{_target_platform}-gcjh
-%{_bindir}/%{_target_platform}-gcj
-%{_bindir}/gij
-%{_bindir}/gc-analyze
-%{_bindir}/gcj-dbtool
-%{_bindir}/gappletviewer
-%{_bindir}/gjar
-%{_bindir}/gjavah
-#%if "%{disable_gjdoc}" != "1"
-%{_bindir}/gjdoc
-#%endif
-%{_bindir}/gnative2ascii
-%{_bindir}/gorbd
-%{_bindir}/gjarsigner
-%{_bindir}/gkeytool
-%{_bindir}/grmic
-%{_bindir}/grmid
-%{_bindir}/grmiregistry
-%{_bindir}/gserialver
-%{_bindir}/gtnameserv
-%{_bindir}/rebuild-gcj-db
-%{_datadir}/java/ecj.jar
-%{_datadir}/gcc-%{version}/python/libjava/aotcompile.py
-%{_datadir}/gcc-%{version}/python/libjava/classfile.py
-%{_mandir}/man1/aot-compile.1.*
-%{_mandir}/man1/gcj.1.*
-%{_mandir}/man1/gcjh.1.*
-#%{_mandir}/man1/gjnih.1.*
-%{_mandir}/man1/jcf-dump.1.*
-#%{_mandir}/man1/jv-scan.1.*
-%{_mandir}/man1/gij.1.*
-%{_mandir}/man1/gcj-dbtool.1.*
-%{_mandir}/man1/gappletviewer.1.*
-%{_mandir}/man1/gc-analyze.1.*
-%{_mandir}/man1/gjar.1.*
-%{_mandir}/man1/gjarsigner.1.*
-%{_mandir}/man1/gjavah.1.*
-%{_mandir}/man1/gjdoc.1.*
-%{_mandir}/man1/gkeytool.1.*
-%{_mandir}/man1/gnative2ascii.1.*
-%{_mandir}/man1/gorbd.1.*
-%{_mandir}/man1/grmid.1.*
-%{_mandir}/man1/gserialver.1.*
-%{_mandir}/man1/gtnameserv.1.*
-%{_mandir}/man1/rebuild-gcj-db.1.*
-
-%files -n %{libgcj_name}
-%defattr(-,root,root)
-%{_mandir}/man1/grmic.1.*
-%{_mandir}/man1/grmiregistry.1.*
-%dir %{_datadir}/java/
-%{_datadir}/java/libgcj-%{version}.jar
-%{_libdir}/logging.properties
-%{_libdir}/libgcj.so.*
-%{_libdir}/libgcj-tools.so.*
-%{_libdir}/libgcj_bc.so.*
-%{_libdir}/libgij.so.*
-%ifarch ppc
-%{_libdir}/nof/logging.properties
-%{_libdir}/nof/libgcj.so.*
-%{_libdir}/nof/libgcj-tools.so.*
-%{_libdir}/nof/libgcj_bc.so.*
-%{_libdir}/nof/libgij.so.*
-%endif
-%{_libdir}/gcj-%{version}*/classmap.db
-%{_libdir}/gcj-%{version}*/libjavamath.la
-%{_libdir}/gcj-%{version}*/libjavamath.so
-%{_libdir}/gcj-%{version}*/libjawt.la
-%{_libdir}/gcj-%{version}*/libjawt.so
-%if "%{disable_jack}" != "1"
-%{_libdir}/gcj-%{version}*/libgjsmdssi.la
-%{_libdir}/gcj-%{version}*/libgjsmdssi.so
-%endif
-%{_libdir}/gcj-%{version}*/libgjsmalsa.la
-%{_libdir}/gcj-%{version}*/libgjsmalsa.so
-%{_libdir}/gcj-%{version}*/libgtkpeer.la
-%{_libdir}/gcj-%{version}*/libgtkpeer.so
-%{_libdir}/gcj-%{version}*/libjvm.la
-%{_libdir}/gcj-%{version}*/libjvm.so
-%ifarch ppc
-%{_libdir}/nof/gcj-%{version}*/libjavamath.la
-%{_libdir}/nof/gcj-%{version}*/libjavamath.so
-%{_libdir}/nof/gcj-%{version}*/classmap.db
-%{_libdir}/nof/gcj-%{version}*/libgjsmalsa.la
-%{_libdir}/nof/gcj-%{version}*/libgjsmalsa.so
-%{_libdir}/nof/gcj-%{version}*/libjvm.a
-%{_libdir}/nof/gcj-%{version}*/libjvm.la
-%{_libdir}/nof/gcj-%{version}*/libjvm.so
-%endif
-%{_datadir}/java/libgcj-tools-%{version}.jar
-%config(noreplace) %{_libdir}/security/classpath.security
-%ifarch ppc
-%config(noreplace) %{_libdir}/nof/security/classpath.security
-%endif
-#%config(noreplace) %{_libdir}/security/libgcj.security
-#%doc libjava/{ChangeLog,COPYING,LIBGCJ_LICENSE,README,THANKS}
-
-%files -n %{libgcj_name}-devel
-%defattr(-,root,root)
-%{_bindir}/jv-convert
-%{_libdir}/libgcj.spec
-%{_libdir}/libgcj.la
-%{_libdir}/libgcj.so
-%{_libdir}/libgcj_bc.so
-%{_libdir}/libgij.la
-%{_libdir}/libgij.so
-%{_libdir}/libgcj-tools.la
-%{_libdir}/libgcj-tools.so
-%ifarch ppc
-%{_libdir}/nof/libgcj.la
-%{_libdir}/nof/libgcj.so
-%{_libdir}/nof/libgcj_bc.so
-%{_libdir}/nof/libgij.la
-%{_libdir}/nof/libgij.so
-%{_libdir}/nof/libgcj-tools.la
-%{_libdir}/nof/libgcj-tools.so
-%endif
-#%{_libdir}/lib-gnu-java-awt-peer-gtk.a
-#%{_libdir}/lib-gnu-java-awt-peer-gtk.la
-#%{_libdir}/lib-gnu-java-awt-peer-gtk.so
-%{_datadir}/java/src-%{version}.zip
-%{_libdir}/pkgconfig/libgcj-%{MAJver}.pc
-%{_mandir}/man1/jv-convert.1.*
-#%doc rpm.doc/boehm-gc/*
-#%doc rpm.doc/libjava/*
-%{_includedir}/c++/%{version}/gcj/*
-%{_includedir}/c++/%{version}/gnu/awt/*
-%{_includedir}/c++/%{version}/gnu/classpath
-%{_includedir}/c++/%{version}/gnu/gcj/*
-%{_includedir}/c++/%{version}/gnu/java/*
-#%{_includedir}/c++/%{version}/gnu/regexp/*
-%{_includedir}/c++/%{version}/java/*
-%{_includedir}/c++/%{version}/javax/*
-%{_libdir}/gcc/%{_target_platform}/%{version}/include/gcj/libgcj-config.h
-%{_libdir}/gcc/%{_target_platform}/%{version}/include/jawt.h
-%{_libdir}/gcc/%{_target_platform}/%{version}/include/jawt_md.h
-%{_libdir}/gcc/%{_target_platform}/%{version}/include/jni.h
-%{_libdir}/gcc/%{_target_platform}/%{version}/include/jvmpi.h
-%endif # disable_java != 1
-
 %if "%{disable_fortran}" != "1"
 #
 # Fortran language
@@ -1430,12 +1174,6 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %{_infodir}/gcc.info.*
 %{_infodir}/gccinstall.info.*
 %{_infodir}/gccint.info.*
-%if "%{disable_java}" != "1"
-%{_infodir}/gcj.info.*
-%if "%{disable_doc}" != "1"
-%doc gcc/doc/gcj.pdf
-%endif
-%endif
 %if "%{disable_fortran}" != "1"
 %{_infodir}/gfortran.info.*
 %if "%{disable_doc}" != "1"
@@ -1477,21 +1215,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %{_prefix}/lib/libatomic.so
 %{_prefix}/lib/libatomic.so.*
 #
-#%{_prefix}/lib/gcj-*/*
-#%{_prefix}/lib/libgcj-tools.la
-#%{_prefix}/lib/libgcj-tools.so
-#%{_prefix}/lib/libgcj-tools.so.*
-#%{_prefix}/lib/libgcj.la
-#%{_prefix}/lib/libgcj.so
-#%{_prefix}/lib/libgcj.so.*
-#%{_prefix}/lib/libgcj_bc.so
-#%{_prefix}/lib/libgcj_bc.so.*
-#%{_prefix}/lib/libgij.la
-#%{_prefix}/lib/libgij.so
-#%{_prefix}/lib/libgij.so.*
-#%{_prefix}/lib/logging.properties
-#%{_prefix}/lib/security/classpath.security
-#%{_prefix}/lib/pkgconfig/libgcj-*.pc
+# gfortran
 #
 %{_prefix}/lib/libgfortran.a
 %{_prefix}/lib/libgfortran.la
@@ -1603,6 +1327,12 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \;
 %endif # cross-platform
 
 %changelog
+* Mon Mar 18 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 8.3.0-3mamba
+- fix for liblto_plugin.so link added in previous release
+
+* Sat Mar 16 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 8.3.0-2mamba
+- added symlink %{_libdir}/bfd-plugins/liblto_plugin.so
+
 * Fri Feb 22 2019 Automatic Build System <autodist@mambasoft.it> 8.3.0-1mamba
 - automatic version update by autodist