Ticket #36418: gcc46-cloog0.17.0-fix.patch

File gcc46-cloog0.17.0-fix.patch, 2.6 KB (added by manphiz@…, 12 years ago)

Proposed fix by gnwiii. Added the configure option "--disable-cloog-version-check" and cloog patch to accomodate older version of gcc, with revbump. (Fixed wrong patch.dir in previous uploaded patch.)

  • Portfile 

    diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/lang/gcc46/Portfile ./Portfile
    old new  
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    12# $Id: Portfile 98042 2012-09-24 01:22:57Z jeremyhu@macports.org $
    23
    34PortSystem 1.0
    … …  
    67name                gcc46
    78epoch               1
    89version             4.6.3
    9 revision            8
     10revision            9
    1011platforms           darwin
    1112categories          lang
    1213maintainers         mww openmaintainer
    … …  
    5455
    5556worksrcdir          build
    5657
     58patchfiles          gcc-4.6-cloog_lang_c.patch
     59patch.dir           ${workpath}/gcc-${version}
     60
    5761post-extract {
    5862    file mkdir ${worksrcpath}
    5963    copy ${distpath}/${ecj} ${workpath}/${distname}/ecj.jar
    … …  
    8286                    --with-mpc=${prefix} \
    8387                    --with-ppl=${prefix} \
    8488                    --with-cloog=${prefix} --enable-cloog-backend=isl \
     89                    --disable-cloog-version-check \
    8590                    --enable-stage1-checking \
    8691                    --disable-multilib \
    8792                    --enable-lto \

  • files/gcc-4.6-cloog_lang_c.patch 

    diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/lang/gcc46/files/gcc-4.6-cloog_lang_c.patch ./files/gcc-4.6-cloog_lang_c.patch
    old new  
     1--- gcc/graphite-clast-to-gimple.c      (revision 186481)
     2+++ gcc/graphite-clast-to-gimple.c      (working copy)
     3@@ -40,6 +40,10 @@
     4 #include "graphite-dependences.h"
     5 #include "graphite-cloog-compat.h"
     6 
     7+#ifndef CLOOG_LANGUAGE_C
     8+#define CLOOG_LANGUAGE_C LANGUAGE_C
     9+#endif
     10+
     11 /* This flag is set when an error occurred during the translation of
     12    CLAST to Gimple.  */
     13 static bool gloog_error;
     14@@ -1367,7 +1371,7 @@
     15   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
     16      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
     17      we pass an incomplete program to cloog.  */
     18-  options->language = LANGUAGE_C;
     19+  options->language = CLOOG_LANGUAGE_C;
     20 
     21   /* Enable complex equality spreading: removes dummy statements
     22      (assignments) in the generated code which repeats the