From 560c2c6cda7e4cffb0a00d7cb8dc97d9c43c1a4a Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Mon, 4 Nov 2019 10:07:09 +0200
Subject: [PATCH] gcc-6: change to new library paths

---
 components/developer/gcc-6/files/unleashed.h |  2 +-
 components/developer/gcc-6/gcc-6.p5m         | 73 +++++++++-------------------
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/components/developer/gcc-6/files/unleashed.h b/components/developer/gcc-6/files/unleashed.h
index 9b7e4f59a..833d52fce 100644
--- a/components/developer/gcc-6/files/unleashed.h
+++ b/components/developer/gcc-6/files/unleashed.h
@@ -56,7 +56,7 @@ along with GCC; see the file COPYING3.  If not see
 	"%{h*} %{R*} %{shared} %{static} %{symbolic:-Bsymbolic} " \
 	"%{!shared:%{static:%{rdynamic:--export-dynamic}}}"
 
-#define STARTFILE_PREFIX_SPEC "%{m32:/lib/i386/ /lib/ /usr/lib/i386/}%{!m32:/lib/amd64/ /lib/ /usr/lib/amd64/} /usr/lib/"
+#define STARTFILE_PREFIX_SPEC "%{m32:/lib/i386/ /usr/lib/i386/}%{!m32:/lib/ /lib/amd64/ /usr/lib/ /usr/lib/amd64/}"
 
 #undef LIB_SPEC
 #define LIB_SPEC "%{!shared:%{pthread:-lpthread} %{p|pg:-ldl} -lc}"
diff --git a/components/developer/gcc-6/gcc-6.p5m b/components/developer/gcc-6/gcc-6.p5m
index 6fe539ee3..78c62772c 100644
--- a/components/developer/gcc-6/gcc-6.p5m
+++ b/components/developer/gcc-6/gcc-6.p5m
@@ -870,30 +870,6 @@ link path=usr/lib/$(MACH32)/libstdc++.so.6 target=libstdc++.so.6.0.22
 file path=usr/lib/$(MACH32)/libstdc++.so.6.0.22
 file path=usr/lib/$(MACH32)/libstdc++.so.6.0.22-gdb.py
 file path=usr/lib/$(MACH32)/libsupc++.a
-file path=usr/lib/$(MACH64)/libgfortran.a
-link path=usr/lib/$(MACH64)/libgfortran.so target=libgfortran.so.3.0.0
-link path=usr/lib/$(MACH64)/libgfortran.so.3 target=libgfortran.so.3.0.0
-file path=usr/lib/$(MACH64)/libgfortran.so.3.0.0
-file path=usr/lib/$(MACH64)/libgfortran.spec
-file path=usr/lib/$(MACH64)/libobjc.a
-link path=usr/lib/$(MACH64)/libobjc.so target=libobjc.so.4.0.0
-link path=usr/lib/$(MACH64)/libobjc.so.4 target=libobjc.so.4.0.0
-file path=usr/lib/$(MACH64)/libobjc.so.4.0.0
-file path=usr/lib/$(MACH64)/libobjc_gc.a
-link path=usr/lib/$(MACH64)/libobjc_gc.so target=libobjc_gc.so.4.0.0
-link path=usr/lib/$(MACH64)/libobjc_gc.so.4 target=libobjc_gc.so.4.0.0
-file path=usr/lib/$(MACH64)/libobjc_gc.so.4.0.0
-file path=usr/lib/$(MACH64)/libssp.a
-link path=usr/lib/$(MACH64)/libssp.so target=libssp.so.0.0.0
-link path=usr/lib/$(MACH64)/libssp.so.0 target=libssp.so.0.0.0
-file path=usr/lib/$(MACH64)/libssp.so.0.0.0
-file path=usr/lib/$(MACH64)/libssp_nonshared.a
-file path=usr/lib/$(MACH64)/libstdc++.a
-link path=usr/lib/$(MACH64)/libstdc++.so target=libstdc++.so.6.0.22
-link path=usr/lib/$(MACH64)/libstdc++.so.6 target=libstdc++.so.6.0.22
-file path=usr/lib/$(MACH64)/libstdc++.so.6.0.22
-file path=usr/lib/$(MACH64)/libstdc++.so.6.0.22-gdb.py
-file path=usr/lib/$(MACH64)/libsupc++.a
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/$(MACH32)/crtbegin.o
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/$(MACH32)/crtbeginS.o
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/$(MACH32)/crtend.o
@@ -1014,31 +990,30 @@ file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/install-t
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/libcaf_single.a
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/libgcc.a
 file path=usr/lib/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/libgcov.a
-# XXX these are 64-bit objs, so until the default lib paths change they should not be here
-#file path=usr/lib/libgfortran.a
-#link path=usr/lib/libgfortran.so target=libgfortran.so.3.0.0
-#link path=usr/lib/libgfortran.so.3 target=libgfortran.so.3.0.0
-#file path=usr/lib/libgfortran.so.3.0.0
-#file path=usr/lib/libgfortran.spec
-#file path=usr/lib/libobjc.a
-#link path=usr/lib/libobjc.so target=libobjc.so.4.0.0
-#link path=usr/lib/libobjc.so.4 target=libobjc.so.4.0.0
-#file path=usr/lib/libobjc.so.4.0.0
-#file path=usr/lib/libobjc_gc.a
-#link path=usr/lib/libobjc_gc.so target=libobjc_gc.so.4.0.0
-#link path=usr/lib/libobjc_gc.so.4 target=libobjc_gc.so.4.0.0
-#file path=usr/lib/libobjc_gc.so.4.0.0
-#file path=usr/lib/libssp.a
-#link path=usr/lib/libssp.so target=libssp.so.0.0.0
-#link path=usr/lib/libssp.so.0 target=libssp.so.0.0.0
-#file path=usr/lib/libssp.so.0.0.0
-#file path=usr/lib/libssp_nonshared.a
-#file path=usr/lib/libstdc++.a
-#link path=usr/lib/libstdc++.so target=libstdc++.so.6.0.22
-#link path=usr/lib/libstdc++.so.6 target=libstdc++.so.6.0.22
-#file path=usr/lib/libstdc++.so.6.0.22
-#file path=usr/lib/libstdc++.so.6.0.22-gdb.py
-#file path=usr/lib/libsupc++.a
+file path=usr/lib/libgfortran.a
+link path=usr/lib/libgfortran.so target=libgfortran.so.3.0.0
+link path=usr/lib/libgfortran.so.3 target=libgfortran.so.3.0.0
+file path=usr/lib/libgfortran.so.3.0.0
+file path=usr/lib/libgfortran.spec
+file path=usr/lib/libobjc.a
+link path=usr/lib/libobjc.so target=libobjc.so.4.0.0
+link path=usr/lib/libobjc.so.4 target=libobjc.so.4.0.0
+file path=usr/lib/libobjc.so.4.0.0
+file path=usr/lib/libobjc_gc.a
+link path=usr/lib/libobjc_gc.so target=libobjc_gc.so.4.0.0
+link path=usr/lib/libobjc_gc.so.4 target=libobjc_gc.so.4.0.0
+file path=usr/lib/libobjc_gc.so.4.0.0
+file path=usr/lib/libssp.a
+link path=usr/lib/libssp.so target=libssp.so.0.0.0
+link path=usr/lib/libssp.so.0 target=libssp.so.0.0.0
+file path=usr/lib/libssp.so.0.0.0
+file path=usr/lib/libssp_nonshared.a
+file path=usr/lib/libstdc++.a
+link path=usr/lib/libstdc++.so target=libstdc++.so.6.0.22
+link path=usr/lib/libstdc++.so.6 target=libstdc++.so.6.0.22
+file path=usr/lib/libstdc++.so.6.0.22
+file path=usr/lib/libstdc++.so.6.0.22-gdb.py
+file path=usr/lib/libsupc++.a
 file path=usr/libexec/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/cc1
 file path=usr/libexec/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/cc1obj
 file path=usr/libexec/gcc/x86_64-unknown-unleashed1.3/$(COMPONENT_VERSION)/cc1plus
-- 
2.11.4.GIT