forked from digital-asset/daml
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch to GHC 8.10.3 (digital-asset#8394)
* Switch to GHC 8.10.3 changelog_begin changelog_end * Update bazel-haskell-deps.bzl Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com> * Comment on rules_haskell patch changelog_begin changelog_end * . changelog_begin changelog_end Co-authored-by: Andreas Herrmann <42969706+aherrmann-da@users.noreply.github.com>
- Loading branch information
1 parent
535ed8a
commit e0c5abd
Showing
59 changed files
with
1,419 additions
and
963 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc | ||
| index 561276f0c2..8b597b4cf2 100644 | ||
| --- a/src/core/lib/gpr/log_linux.cc | ||
| +++ b/src/core/lib/gpr/log_linux.cc | ||
| @@ -40,7 +40,7 @@ | ||
| #include <time.h> | ||
| #include <unistd.h> | ||
|
|
||
| -static long gettid(void) { return syscall(__NR_gettid); } | ||
| +static long sys_gettid(void) { return syscall(__NR_gettid); } | ||
|
|
||
| void gpr_log(const char* file, int line, gpr_log_severity severity, | ||
| const char* format, ...) { | ||
| @@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { | ||
| gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); | ||
| struct tm tm; | ||
| static __thread long tid = 0; | ||
| - if (tid == 0) tid = gettid(); | ||
| + if (tid == 0) tid = sys_gettid(); | ||
|
|
||
| timer = static_cast<time_t>(now.tv_sec); | ||
| final_slash = strrchr(args->file, '/'); | ||
| diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc | ||
| index b6edc14ab6..2f7c6ce376 100644 | ||
| --- a/src/core/lib/gpr/log_posix.cc | ||
| +++ b/src/core/lib/gpr/log_posix.cc | ||
| @@ -31,7 +31,7 @@ | ||
| #include <string.h> | ||
| #include <time.h> | ||
|
|
||
| -static intptr_t gettid(void) { return (intptr_t)pthread_self(); } | ||
| +static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } | ||
|
|
||
| void gpr_log(const char* file, int line, gpr_log_severity severity, | ||
| const char* format, ...) { | ||
| @@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { | ||
| char* prefix; | ||
| gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", | ||
| gpr_log_severity_string(args->severity), time_buffer, | ||
| - (int)(now.tv_nsec), gettid(), display_file, args->line); | ||
| + (int)(now.tv_nsec), sys_gettid(), display_file, args->line); | ||
|
|
||
| fprintf(stderr, "%-70s %s\n", prefix, args->message); | ||
| gpr_free(prefix); | ||
| diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc | ||
| index 08116b3ab5..76f5984431 100644 | ||
| --- a/src/core/lib/iomgr/ev_epollex_linux.cc | ||
| +++ b/src/core/lib/iomgr/ev_epollex_linux.cc | ||
| @@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, | ||
| } | ||
|
|
||
| #ifndef NDEBUG | ||
| -static long gettid(void) { return syscall(__NR_gettid); } | ||
| +static long sys_gettid(void) { return syscall(__NR_gettid); } | ||
| #endif | ||
|
|
||
| /* pollset->mu lock must be held by the caller before calling this. | ||
| @@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, | ||
| #define WORKER_PTR (&worker) | ||
| #endif | ||
| #ifndef NDEBUG | ||
| - WORKER_PTR->originator = gettid(); | ||
| + WORKER_PTR->originator = sys_gettid(); | ||
| #endif | ||
| if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { | ||
| gpr_log(GPR_INFO, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/haskell/private/cc_wrapper_windows.sh.tpl b/haskell/private/cc_wrapper_windows.sh.tpl | ||
| index e62c07a5..0d64de97 100644 | ||
| --- a/haskell/private/cc_wrapper_windows.sh.tpl | ||
| +++ b/haskell/private/cc_wrapper_windows.sh.tpl | ||
| @@ -183,7 +183,7 @@ handle_arg() { | ||
| handle_lib_dir "$arg" | ||
| elif [[ "$arg" =~ ^@(.*)$ ]]; then | ||
| (( ++IN_RESPONSE_FILE )) | ||
| - while read -r line; do | ||
| + while IFS=$' \t\r\n' read -r line; do | ||
| handle_arg "$line" | ||
| done < "${BASH_REMATCH[1]}" | ||
| (( --IN_RESPONSE_FILE )) || true |
Oops, something went wrong.