diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-01-21 16:48:46 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-07-23 18:41:06 +0100 |
| commit | 53f68f6e2a5658391d3c042c3acf627663c0c492 (patch) | |
| tree | d3b8c30f50959af67e67be34b6d2b81e3fcf1605 /m68k-unknown-amigaos | |
| parent | 5a3bdb17858fca61c5f7f2f5e3dab266c10daec1 (diff) | |
| download | toolchains-53f68f6e2a5658391d3c042c3acf627663c0c492.tar.gz toolchains-53f68f6e2a5658391d3c042c3acf627663c0c492.tar.bz2 | |
Revert "Try to fix some paths"
This reverts commit 69e959540abcdd8c972d0ed68e1ba5cd0abf73e6.
Diffstat (limited to 'm68k-unknown-amigaos')
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index 6664a04..a727fd3 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -5861,7 +5861,7 @@ index bf3f32da08ac..7aa190620911 100644 ;; +m68k*-*-amigaosvasm*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_AMIGAOS_VASM TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -5871,7 +5871,7 @@ index bf3f32da08ac..7aa190620911 100644 + ;; +m68k*-*-amigaos*) + default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/amigaos.h" ++ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" + tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_CPU_DEFAULT=0" + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" + tm_p_file="${tm_p_file} m68k/amigaos-protos.h" @@ -8687,7 +8687,7 @@ index 000000000000..3f3aafc5f254 + "-isystem %:sdk_root(libnix/include) " \ + "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix" +#define CPP_CLIB2_SPEC \ -+ "-isystem %:sdk_root(include) " \ ++ "-isystem %:sdk_root(clib2/include) " \ + "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2" + +/* Define __HAVE_68881__ in preprocessor according to the -m flags. @@ -8774,7 +8774,7 @@ index 000000000000..3f3aafc5f254 + ")" + +#define STARTFILE_CLIB2_SPEC \ -+ "%:sdk_root(lib/ " \ ++ "%:sdk_root(clib2/lib/ " \ + "%{resident32:nr32crt0.o%s}" \ + "%{!resident32:" \ + "%{fbaserel32:nb32crt0.o%s}" \ @@ -8871,7 +8871,7 @@ index 000000000000..3f3aafc5f254 + +#define LINK_IXEMUL_SPEC "" +#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix" -+#define LINK_CLIB2_SPEC "-L%:sdk_root(lib)" ++#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)" + +/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD + compatible debug hunk. @@ -9833,7 +9833,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 +#ifdef TARGET_AMIGA +const char * amiga_m68k_prefix_func(int argc, const char ** argv) { + char * p = 0; -+ /* if (standard_libexec_prefix) ++ if (standard_libexec_prefix) + { + char * glp = concat(standard_libexec_prefix, "", NULL); + p = strrchr(glp, '/'); @@ -9848,12 +9848,12 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + if (p) + { + p[1] = 0; -+ p = concat(glp, "m68k-unknown-amigaos/", NULL); ++ p = concat(glp, "m68k-amigaos/", NULL); + } + } + } + free(glp); -+ }*/ ++ } + if (!p) + p = concat("../../../../", "", NULL); + @@ -9862,7 +9862,7 @@ index 85ea19bd3a09..a4da7d515ce5 100644 + free(p); + p = q; + } -+ //*p = 0; ++// printf("amiga_m68k_prefix_func='%s'\n", p); + return p; +} +#endif |