summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2018-01-20 22:21:06 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2018-07-23 18:41:06 +0100
commit51c12c241aa5edaf7ed74d13bae0429afc7fb463 (patch)
tree295b7fdf8bf2fa03daa02d34c05acb353d6df809
parent7047874498641f6199233272bc4b81927a8b152a (diff)
downloadtoolchains-51c12c241aa5edaf7ed74d13bae0429afc7fb463.tar.gz
toolchains-51c12c241aa5edaf7ed74d13bae0429afc7fb463.tar.bz2
Attempt to default to clib2
-rw-r--r--m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p12
1 files changed, 6 insertions, 6 deletions
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
index bac72b5..956c635 100644
--- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p
@@ -8717,7 +8717,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(cpp_libnix)} " \
+ "%{mcrt=ixemul:%(cpp_ixemul)} " \
+ "%{mcrt=clib2:%(cpp_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(cpp_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(cpp_clib2)}}"
+
+/* Various -m flags require special flags to the assembler. */
+
@@ -8795,7 +8795,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(startfile_libnix)} " \
+ "%{mcrt=ixemul:%(startfile_ixemul)} " \
+ "%{mcrt=clib2:%(startfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(startfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(startfile_clib2)}}"
+#endif
+
+#define ENDFILE_IXEMUL_SPEC ""
@@ -8808,7 +8808,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(endfile_libnix)} " \
+ "%{mcrt=ixemul:%(endfile_ixemul)} " \
+ "%{mcrt=clib2:%(endfile_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(endfile_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(endfile_clib2)}}"
+
+
+/* Automatically search libamiga.a for AmigaOS specific functions. Note
@@ -8861,7 +8861,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(libgcc_libnix)} " \
+ "%{mcrt=ixemul:%(libgcc_ixemul)} " \
+ "%{mcrt=clib2:%(libgcc_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(libgcc_libnix)}}"
++ "%{!noixemul:%{!mcrt*:%(libgcc_clib2)}}"
+
+
+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD
@@ -8884,7 +8884,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \
@@ -8904,7 +8904,7 @@ index 000000000000..3f3aafc5f254
+ "%{mcrt=nix*:%(link_libnix)} " \
+ "%{mcrt=ixemul:%(link_ixemul)} " \
+ "%{mcrt=clib2:%(link_clib2)} " \
-+ "%{!noixemul:%{!mcrt*:%(link_libnix)}} " \
++ "%{!noixemul:%{!mcrt*:%(link_clib2)}} " \
+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \
+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \
+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \