Files
allwpilib/upstream_utils/llvm_patches/0030-raw_ostream-remove-auto-conversion.patch
2026-05-26 21:55:50 -07:00

47 lines
1.6 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Sun, 17 Mar 2024 14:51:11 -0700
Subject: [PATCH 30/34] raw_ostream: remove auto-conversion
---
llvm/lib/Support/raw_ostream.cpp | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index a9cea8ac7fa2a7edbfeb76dbed6a92e189edbbd9..21a00f58e3ed3a033a75fd5ca64d94486f9a8d42 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -19,7 +19,6 @@
#include "wpi/util/SmallVector.hpp"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Config/config.h"
-#include "llvm/Support/AutoConvert.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
@@ -600,23 +599,13 @@ raw_fd_ostream &llvm::outs() {
// Set buffer settings to model stdout behavior.
std::error_code EC;
- // On z/OS we need to enable auto conversion
- static std::error_code EC1 = enableAutoConversion(STDOUT_FILENO);
- assert(!EC1);
- (void)EC1;
-
static raw_fd_ostream* S = new raw_fd_ostream("-", EC, sys::fs::OF_None);
assert(!EC);
return *S;
}
raw_fd_ostream &llvm::errs() {
- // On z/OS we need to enable auto conversion
- static std::error_code EC = enableAutoConversion(STDERR_FILENO);
- assert(!EC);
- (void)EC;
-
- // Set standard error to be unbuffered.
+ // Set standard error to be unbuffered and tied to outs() by default.
static raw_fd_ostream* S = new raw_fd_ostream(STDERR_FILENO, false, true);
return *S;
}