Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit a65bbfd

Browse files
committedJan 26, 2018
Fix compile on dist-i686-linux builder
If this lines are present then we apparently get errors [1] when compiling in the current [2] dist-i686-linux container. Attempts to upgrade both gcc and binutils did not fix the error, so it appears that this may just be a bug in the super old glibc we're using on the dist-i686-linux container. We don't actually need this code anyway, so just work around these issues by removing references to the `*64` functions. This'll get things compiling locally and shouldn't be a regression in functionality. [1]: https://travis-ci.org/rust-lang/rust/jobs/257578199 [2]: https://github.com/rust-lang/rust/tree/eba9d7f08ce5c90549ee52337aca0010ad566f0d/src/ci/docker/dist-i686-linux
1 parent 013f2ec commit a65bbfd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ void RTDyldMemoryManager::deregisterEHFramesInProcess(uint8_t *Addr,
119119

120120
void RTDyldMemoryManager::registerEHFramesInProcess(uint8_t *Addr,
121121
size_t Size) {
122-
// On Linux __register_frame takes a single argument:
122+
// On Linux __register_frame takes a single argument:
123123
// a pointer to the start of the .eh_frame section.
124124

125-
// How can it find the end? Because crtendS.o is linked
125+
// How can it find the end? Because crtendS.o is linked
126126
// in and it has an .eh_frame section with four zero chars.
127127
__register_frame(Addr);
128128
}
@@ -243,9 +243,9 @@ RTDyldMemoryManager::getSymbolAddressInProcess(const std::string &Name) {
243243
if (Name == "stat") return (uint64_t)&stat;
244244
if (Name == "fstat") return (uint64_t)&fstat;
245245
if (Name == "lstat") return (uint64_t)&lstat;
246-
if (Name == "stat64") return (uint64_t)&stat64;
247-
if (Name == "fstat64") return (uint64_t)&fstat64;
248-
if (Name == "lstat64") return (uint64_t)&lstat64;
246+
// if (Name == "stat64") return (uint64_t)&stat64;
247+
// if (Name == "fstat64") return (uint64_t)&fstat64;
248+
// if (Name == "lstat64") return (uint64_t)&lstat64;
249249
if (Name == "atexit") return (uint64_t)&atexit;
250250
if (Name == "mknod") return (uint64_t)&mknod;
251251

@@ -255,7 +255,7 @@ RTDyldMemoryManager::getSymbolAddressInProcess(const std::string &Name) {
255255
return (uint64_t)&__morestack;
256256
#endif
257257
#endif // __linux__ && __GLIBC__
258-
258+
259259
// See ARM_MATH_IMPORTS definition for explanation
260260
#if defined(__BIONIC__) && defined(__arm__)
261261
if (Name.compare(0, 8, "__aeabi_") == 0) {

0 commit comments

Comments
 (0)