diff options
Diffstat (limited to 'devel/flang/files')
11 files changed, 21 insertions, 90 deletions
diff --git a/devel/flang/files/patch-CMakeLists.txt b/devel/flang/files/patch-CMakeLists.txt index 62c8688913b8..784445f72ab8 100644 --- a/devel/flang/files/patch-CMakeLists.txt +++ b/devel/flang/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-07-17 19:12:06 UTC +--- CMakeLists.txt.orig 2017-10-19 11:03:03 UTC +++ CMakeLists.txt -@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" ) +@@ -51,6 +51,19 @@ if( ${TARGET_OS} STREQUAL "Linux" ) message("Unsupported architecture: ${TARGET_ARCHITECTURE}" ) return() endif() @@ -20,7 +20,7 @@ else() message("Unsupported OS: ${TARGET_OS}" ) return() -@@ -56,7 +69,8 @@ endif() +@@ -59,7 +72,8 @@ endif() # The cmake documentation states that these are set. They are not so we # set them here set(CMAKE_HOST_SYSTEM_NAME ${TARGET_OS}) @@ -30,12 +30,12 @@ # If we are not building as a part of LLVM, build Flang as an # standalone project, using LLVM as an external library: -@@ -292,7 +306,7 @@ endif() +@@ -296,7 +310,7 @@ endif() # Add appropriate flags for GCC if (LLVM_COMPILER_IS_GCC_COMPATIBLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-macro-redefined -Wno-logical-not-parentheses -Wno-unknown-warning-option") - endif () - - if (APPLE) +- option(WITH_WERROR "Compile with '-Werror' C compiler flag" ON) ++ option(WITH_WERROR "Compile with '-Werror' C compiler flag" OFF) + if (WITH_WERROR) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + endif () diff --git a/devel/flang/files/patch-runtime_flang_async.c b/devel/flang/files/patch-runtime_flang_async.c index 0b5470515e01..2af5c25a7f9f 100644 --- a/devel/flang/files/patch-runtime_flang_async.c +++ b/devel/flang/files/patch-runtime_flang_async.c @@ -1,37 +1,14 @@ ---- runtime/flang/async.c.orig 2017-05-17 00:40:01 UTC +--- runtime/flang/async.c.orig 2017-10-19 11:03:03 UTC +++ runtime/flang/async.c -@@ -27,6 +27,8 @@ - * Fio_asy_close - called from close - */ +@@ -39,9 +39,10 @@ + #include <errno.h> + #endif +#include <sys/signal.h> + - #if !defined(INTERIX86) && !defined(TARGET_INTERIX) && !defined(TARGET_OSX) && !defined(CRAY) && !defined(TARGET_WIN_X8632) - - #if !defined(TARGET_WIN_X8664) -@@ -44,7 +46,6 @@ #include "stdioInterf.h" #include "async.h" - - + #define FIO_MAX_ASYNC_TRANSACTIONS 16 - /* one struct per file */ -@@ -320,7 +321,7 @@ Fio_asy_read(struct asy *asy, void *adr, - asy->aiocb[tn].aio_reqprio = 0; - asy->aiocb[tn].aio_buf = adr; - asy->aiocb[tn].aio_nbytes = len; -- memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(sigevent_t)); -+ memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(struct sigevent)); - asy->aiocb[tn].aio_offset = asy->atd[tn].off; - n = aio_read(&(asy->aiocb[tn])); - #endif -@@ -374,7 +375,7 @@ Fio_asy_write(struct asy *asy, void *adr - asy->aiocb[tn].aio_reqprio = 0; - asy->aiocb[tn].aio_buf = adr; - asy->aiocb[tn].aio_nbytes = len; -- memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(sigevent_t)); -+ memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(struct sigevent)); - asy->aiocb[tn].aio_offset = asy->atd[tn].off; - n = aio_write(&(asy->aiocb[tn])); - #endif diff --git a/devel/flang/files/patch-runtime_flang_cdexp.c b/devel/flang/files/patch-runtime_flang_cdexp.c deleted file mode 100644 index b56b2e1e769d..000000000000 --- a/devel/flang/files/patch-runtime_flang_cdexp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- runtime/flang/cdexp.c.orig 2017-05-17 00:40:01 UTC -+++ runtime/flang/cdexp.c -@@ -22,7 +22,8 @@ __mth_i_cdexp(dcmplx_t *dcmplx, double r - { - double x, y, z; - x = exp(real); -- sincos(imag, &z, &y); -+ z = sin(imag); -+ y = cos(imag); - y *= x; - z *= x; - d_dummy(y, z); /* should leave y & z in appropriate diff --git a/devel/flang/files/patch-runtime_flang_cexp.c b/devel/flang/files/patch-runtime_flang_cexp.c deleted file mode 100644 index b840933d41cd..000000000000 --- a/devel/flang/files/patch-runtime_flang_cexp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- runtime/flang/cexp.c.orig 2017-05-17 00:40:01 UTC -+++ runtime/flang/cexp.c -@@ -22,7 +22,8 @@ __mth_i_cexp(cmplx_t *cmplx, float real, - { - float x, y, z; - x = exp(real); -- sincosf(imag, &z, &y); -+ z = sinf(imag); -+ y = cosf(imag); - y *= x; - z *= x; - r_dummy(y, z); /* should leave y & z in appropriate diff --git a/devel/flang/files/patch-runtime_flang_stime3f.c b/devel/flang/files/patch-runtime_flang_stime3f.c index e0d08dd0ded7..4e8bc9a3e7f2 100644 --- a/devel/flang/files/patch-runtime_flang_stime3f.c +++ b/devel/flang/files/patch-runtime_flang_stime3f.c @@ -1,4 +1,4 @@ ---- runtime/flang/stime3f.c.orig 2017-05-17 00:40:01 UTC +--- runtime/flang/stime3f.c.orig 2017-10-19 11:03:03 UTC +++ runtime/flang/stime3f.c @@ -27,13 +27,7 @@ diff --git a/devel/flang/files/patch-runtime_flangrti_dumpregs.h b/devel/flang/files/patch-runtime_flangrti_dumpregs.h index 4da25a6133f0..62e0c768540c 100644 --- a/devel/flang/files/patch-runtime_flangrti_dumpregs.h +++ b/devel/flang/files/patch-runtime_flangrti_dumpregs.h @@ -1,4 +1,4 @@ ---- runtime/flangrti/dumpregs.h.orig 2017-05-17 00:40:01 UTC +--- runtime/flangrti/dumpregs.h.orig 2017-10-19 11:03:03 UTC +++ runtime/flangrti/dumpregs.h @@ -21,6 +21,6 @@ * Declare routines that access the machine registers diff --git a/devel/flang/files/patch-runtime_flangrti_erfc__scaled.c b/devel/flang/files/patch-runtime_flangrti_erfc__scaled.c deleted file mode 100644 index adf5b26114e2..000000000000 --- a/devel/flang/files/patch-runtime_flangrti_erfc__scaled.c +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flangrti/erfc_scaled.c.orig 2017-05-17 00:40:01 UTC -+++ runtime/flangrti/erfc_scaled.c -@@ -19,7 +19,7 @@ - #pragma global - Mx, 6, 0x100 - - #include "mthdecls.h" --#if defined(TARGET_WIN) || defined(win32) || defined(TARGET_OSX) -+#if defined(TARGET_WIN) || defined(win32) || defined(TARGET_OSX) || defined(__FreeBSD__) - #include <float.h> - #else - #include <values.h> diff --git a/devel/flang/files/patch-runtime_flangrti_erfc__scaledf.c b/devel/flang/files/patch-runtime_flangrti_erfc__scaledf.c deleted file mode 100644 index a850b7e8c059..000000000000 --- a/devel/flang/files/patch-runtime_flangrti_erfc__scaledf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flangrti/erfc_scaledf.c.orig 2017-05-17 00:40:01 UTC -+++ runtime/flangrti/erfc_scaledf.c -@@ -19,7 +19,7 @@ - #pragma global - Mx, 6, 0x100 - - #include "mthdecls.h" --#if defined(TARGET_WIN) || defined(win32) || defined(TARGET_OSX) -+#if defined(TARGET_WIN) || defined(win32) || defined(TARGET_OSX) || defined(__FreeBSD__) - #include <float.h> - #else - #include <values.h> diff --git a/devel/flang/files/patch-runtime_flangrti_iostdinit.c b/devel/flang/files/patch-runtime_flangrti_iostdinit.c index c75ed4e8909d..d1b8bebbc3ac 100644 --- a/devel/flang/files/patch-runtime_flangrti_iostdinit.c +++ b/devel/flang/files/patch-runtime_flangrti_iostdinit.c @@ -1,4 +1,4 @@ ---- runtime/flangrti/iostdinit.c.orig 2017-05-17 00:40:01 UTC +--- runtime/flangrti/iostdinit.c.orig 2017-10-19 11:03:03 UTC +++ runtime/flangrti/iostdinit.c @@ -160,7 +160,7 @@ __io_ferror(void *p) int @@ -9,7 +9,7 @@ } /* is a tty? */ -@@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for +@@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for crtdll.dll */ #define timezone _timezone /* cygnus, timezone is usually a function */ #endif diff --git a/devel/flang/files/patch-runtime_flangrti_trace__lin.c b/devel/flang/files/patch-runtime_flangrti_trace__lin.c index 353a9b46e037..90675b02beef 100644 --- a/devel/flang/files/patch-runtime_flangrti_trace__lin.c +++ b/devel/flang/files/patch-runtime_flangrti_trace__lin.c @@ -1,4 +1,4 @@ ---- runtime/flangrti/trace_lin.c.orig 2017-05-17 00:40:01 UTC +--- runtime/flangrti/trace_lin.c.orig 2017-10-19 11:03:03 UTC +++ runtime/flangrti/trace_lin.c @@ -85,7 +85,7 @@ static struct sigs sigs[] = { {0, CODNULL, NULL} /* end of list */ @@ -11,7 +11,7 @@ @@ -99,7 +99,7 @@ __abort_trace(int skip) char **strings; - size_t i, n; + size_t i; - if (regs != (gregset_t *)0) { + if (regs != (void *)0) { diff --git a/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c b/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c index 1b52fb8db1be..25663e437b48 100644 --- a/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c +++ b/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c @@ -1,4 +1,4 @@ ---- runtime/flangrti/x86_64-Linux/dumpregs.c.orig 2017-05-17 00:40:01 UTC +--- runtime/flangrti/x86_64-Linux/dumpregs.c.orig 2017-10-19 11:03:03 UTC +++ runtime/flangrti/x86_64-Linux/dumpregs.c @@ -40,7 +40,7 @@ #define RSP 15 |