Merge "Fix P4 linux make builds" into amd-master-next

saleelk · Gerrit Code Review · commit ffcbd7e63395 · 2020-03-11T16:17:18.000-04:00
diff --git a/vdi/hip_rtc.cpp b/vdi/hip_rtc.cpp
@@ -105,9 +105,9 @@ char* demangle(const char* loweredName) {
   if (!loweredName) {
     return nullptr;
   }
-#if HIPRTC_USE_CXXABI || __linux__
+#if __linux__
   int status = 0;
-  char* demangledName = abi::__cxa_demangle(loweredName, nullptr, nullptr, &status);
+  char* demangledName = DEMANGLE(loweredName, nullptr, nullptr, &status);
   if (status != 0) {
     return nullptr;
   }
@@ -122,7 +122,7 @@ char* demangle(const char* loweredName) {
   }
 #else
 #error "Only Linux and Windows are supported"
-#endif // HIPRTC_USE_CXXABI || __linux__
+#endif // __linux__
   return demangledName;
 }
 
diff --git a/vdi/hiprtc_internal.hpp b/vdi/hiprtc_internal.hpp
@@ -23,17 +23,28 @@
 
 #include "hip_internal.hpp"
 
-#if HIPRTC_USE_CXXABI || __linux__
-#include <cxxabi.h>
+#if __linux__
 #include <cstdlib>
 
+#if HIPRTC_USE_CXXABI
+#include <cxxabi.h>
+
+#define DEMANGLE abi::__cxa_demangle
+
+#else
+extern "C" char * __cxa_demangle(const char *mangled_name, char *output_buffer,
+                                size_t *length, int *status);
+
+#define DEMANGLE __cxa_demangle
+#endif //HIPRTC_USE_CXXABI
+
 #elif defined(_WIN32)
 #include <Windows.h>
 #include <DbgHelp.h>
 
 #define UNDECORATED_SIZE 4096
 
-#endif // HIPRTC_USE_CXXABI || __linux__
+#endif // __linux__
 
 // This macro should be called at the beginning of every HIP RTC API.
 #define HIPRTC_INIT_API(...)                                 \

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,9 @@ char* demangle(const char* loweredName) {`
`105`	`105`	`if (!loweredName) {`
`106`	`106`	`return nullptr;`
`107`	`107`	`}`
`108`		`-#if HIPRTC_USE_CXXABI \|\| __linux__`
	`108`	`+#if __linux__`
`109`	`109`	`int status = 0;`
`110`		`- char* demangledName = abi::__cxa_demangle(loweredName, nullptr, nullptr, &status);`
	`110`	`+ char* demangledName = DEMANGLE(loweredName, nullptr, nullptr, &status);`
`111`	`111`	`if (status != 0) {`
`112`	`112`	`return nullptr;`
`113`	`113`	`}`
`@@ -122,7 +122,7 @@ char* demangle(const char* loweredName) {`
`122`	`122`	`}`
`123`	`123`	`#else`
`124`	`124`	`#error "Only Linux and Windows are supported"`
`125`		`-#endif // HIPRTC_USE_CXXABI \|\| __linux__`
	`125`	`+#endif // __linux__`
`126`	`126`	`return demangledName;`
`127`	`127`	`}`
`128`	`128`