From e840b9d86f6c2cc9cb908a7ac51efa4cee0c9aae Mon Sep 17 00:00:00 2001
From: Sean Keely <Sean.Keely@amd.com>
Date: Wed, 17 Jun 2020 23:08:25 -0500
Subject: [PATCH] Add addrlib to static linking namespace.

Wrap addrlib in namespace rocr.  Remove extern "C" declaration.

Change-Id: I9f7fc60df3fc12ca72a71f13561692a8ddf9829c
---
 runtime/hsa-runtime/image/addrlib/inc/addrinterface.h    | 9 ++-------
 runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp  | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h  | 3 +++
 .../hsa-runtime/image/addrlib/src/core/addrelemlib.cpp   | 4 +++-
 runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h | 4 +++-
 runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp   | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrlib.h     | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp  | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h    | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp  | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h    | 3 +++
 .../hsa-runtime/image/addrlib/src/core/addrobject.cpp    | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/addrobject.h  | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/coord.cpp     | 3 +++
 runtime/hsa-runtime/image/addrlib/src/core/coord.h       | 3 +++
 .../image/addrlib/src/gfx10/gfx10SwizzlePattern.h        | 3 +++
 .../hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp | 3 +++
 .../hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h   | 3 +++
 .../hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp   | 4 +++-
 runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h | 3 +++
 runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp | 3 +++
 runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h   | 3 +++
 .../hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp    | 3 +++
 runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h  | 3 +++
 runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp | 3 +++
 runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h   | 3 +++
 26 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h b/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
index c0e370f2be..517be64fdb 100644
--- a/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
+++ b/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
@@ -35,10 +35,7 @@
 
 #include "addrtypes.h"
 
-#if defined(__cplusplus)
-extern "C"
-{
-#endif
+namespace rocr {
 
 #define ADDRLIB_VERSION_MAJOR 6
 #define ADDRLIB_VERSION_MINOR 2
@@ -3720,8 +3717,6 @@ ADDR_E_RETURNCODE ADDR_API Addr2IsValidDisplaySwizzleMode(
     UINT_32         bpp,
     bool            *result);
 
-#if defined(__cplusplus)
-}
-#endif
+} // rocr
 
 #endif // __ADDR_INTERFACE_H__
diff --git a/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp b/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
index 5256499b3b..7d87029858 100644
--- a/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
@@ -38,6 +38,7 @@
 
 #include "util/macros.h"
 
+namespace rocr {
 using namespace Addr;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1738,3 +1739,5 @@ ADDR_E_RETURNCODE ADDR_API Addr2IsValidDisplaySwizzleMode(
 
     return returnCode;
 }
+
+} // rocr
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h b/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
index f2f8c6a038..d03d7bf403 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
@@ -162,6 +162,7 @@
 
 #define ADDR_C_ASSERT(__e) STATIC_ASSERT(__e)
 
+namespace rocr {
 namespace Addr
 {
 
@@ -943,6 +944,8 @@ static inline UINT_32 ShiftCeil(
 }
 
 } // Addr
+} // rocr
+
 
 #endif // __ADDR_COMMON_H__
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp b/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
index 27afb593b6..ff501a7aeb 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
@@ -34,6 +34,7 @@
 #include "addrelemlib.h"
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -1827,4 +1828,5 @@ BOOL_32 ElemLib::IsMacroPixelPacked(
     return isMacroPixelPacked;
 }
 
-}
+} // Addr
+} // rocr
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h b/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
index 519e194f3d..e8ad02756f 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
@@ -38,6 +38,7 @@
 #include "addrobject.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -273,7 +274,8 @@ private:
     Addr::Lib* const    m_pAddrLib;         ///< Pointer to parent addrlib instance
 };
 
-} //Addr
+} // Addr
+} // rocr
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
index 5d99d4db0d..d24b8749de 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
@@ -81,6 +81,7 @@ UINT_32 __umoddi3(UINT_64 n, UINT_32 base)
 
 #endif // __APPLE__
 
+namespace rocr {
 namespace Addr
 {
 
@@ -658,3 +659,5 @@ UINT_32 Lib::GetBpe(AddrFormat format) const
 }
 
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h b/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
index c1510d6b5a..5584a49eea 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
@@ -56,6 +56,7 @@
 #define CIASICIDGFXENGINE_ARCTICISLAND 0x0000000D
 #endif
 
+namespace rocr {
 namespace Addr
 {
 
@@ -411,5 +412,7 @@ Lib* CiHwlInit   (const Client* pClient);
 Lib* Gfx9HwlInit (const Client* pClient);
 Lib* Gfx10HwlInit(const Client* pClient);
 } // Addr
+} // rocr
+
 
 #endif
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp b/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
index 0704e0f4e1..ad27785a18 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
@@ -35,6 +35,7 @@
 #include "addrlib1.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -4059,3 +4060,5 @@ ADDR_E_RETURNCODE Lib::ComputePrtInfo(
 
 } // V1
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h b/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
index 5411d1c1a8..904967bfd3 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
@@ -36,6 +36,7 @@
 
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -539,6 +540,8 @@ private:
 
 } // V1
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp b/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
index 0007e2b9fb..700287abd4 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
@@ -35,6 +35,7 @@
 #include "addrlib2.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -1982,4 +1983,6 @@ VOID Lib::FilterInvalidEqSwizzleMode(
 
 } // V2
 } // Addr
+} // rocr
+
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h b/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
index 75fe6442db..1e32742384 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
@@ -36,6 +36,7 @@
 
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -863,6 +864,8 @@ private:
 
 } // V2
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp b/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
index d148d2f564..5d26d93fd5 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
@@ -34,6 +34,7 @@
 #include "addrinterface.h"
 #include "addrobject.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -235,3 +236,5 @@ VOID Object::DebugPrint(
 }
 
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h b/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
index 0555975771..ab68508cc9 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
@@ -37,6 +37,7 @@
 #include "addrtypes.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -91,5 +92,7 @@ private:
 };
 
 } // Addr
+} // rocr
+
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp b/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
index 3cf066daa9..e022b3b2e7 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
@@ -29,6 +29,7 @@
 #include "addrcommon.h"
 #include "coord.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -602,3 +603,5 @@ BOOL_32 CoordEq::operator!=(const CoordEq& b)
 
 } // V2
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/core/coord.h b/runtime/hsa-runtime/image/addrlib/src/core/coord.h
index c14bf7b0d4..bbbb169d22 100644
--- a/runtime/hsa-runtime/image/addrlib/src/core/coord.h
+++ b/runtime/hsa-runtime/image/addrlib/src/core/coord.h
@@ -29,6 +29,7 @@
 #ifndef __COORD_H
 #define __COORD_H
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -127,6 +128,8 @@ private:
 
 } // V2
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
index 45d3809d9f..249738a2fe 100644
--- a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
+++ b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
@@ -34,6 +34,7 @@
 #ifndef __GFX10_SWIZZLE_PATTERN_H__
 #define __GFX10_SWIZZLE_PATTERN_H__
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -6115,5 +6116,7 @@ const UINT_64 CMASK_SW_PATTERN[][17] =
 
 } // V2
 } // Addr
+} // rocr
+
 
 #endif
diff --git a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
index 4033c2398d..6cd6a3e602 100644
--- a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
@@ -39,6 +39,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+namespace rocr {
 namespace Addr
 {
 /**
@@ -4310,3 +4311,5 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlComputeSurfaceInfoLinear(
 
 } // V2
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
index c9a24c04cc..80f22b3764 100644
--- a/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
@@ -38,6 +38,7 @@
 #include "coord.h"
 #include "gfx10SwizzlePattern.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -578,6 +579,8 @@ private:
 
 } // V2
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
index dcc080cbec..df00791d8e 100644
--- a/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
@@ -41,7 +41,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 
@@ -5056,3 +5056,5 @@ VOID Gfx9Lib::ComputeThinBlockDimension(
 
 } // V2
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h b/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
index 93e6515b26..a620223fd0 100644
--- a/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
@@ -37,6 +37,7 @@
 #include "addrlib2.h"
 #include "coord.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -635,6 +636,8 @@ private:
 
 } // V2
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
index 5a83e71530..29ac53fe64 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
@@ -40,6 +40,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+namespace rocr {
 namespace Addr
 {
 
@@ -2337,3 +2338,5 @@ BOOL_32 CiLib::CheckTcCompatibility(
 
 } // V1
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h b/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
index 6461389f42..f77189822c 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
@@ -37,6 +37,7 @@
 #include "addrlib1.h"
 #include "siaddrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -201,5 +202,7 @@ private:
 
 } // V1
 } // Addr
+} // rocr
+
 
 #endif
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
index bdeda5ff5f..6a558c7b10 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
@@ -34,6 +34,7 @@
 
 #include "util/macros.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -4151,3 +4152,5 @@ UINT_32 EgBasedLib::HwlStereoCheckRightOffsetPadding(
 
 } // V1
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h b/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
index 55e53540e9..19c19ee98a 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
@@ -36,6 +36,7 @@
 
 #include "addrlib1.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -425,6 +426,8 @@ protected:
 
 } // V1
 } // Addr
+} // rocr
+
 
 #endif
 
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp b/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
index c91f72640a..02a4e103e1 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
@@ -38,6 +38,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
+namespace rocr {
 namespace Addr
 {
 
@@ -3871,3 +3872,5 @@ BOOL_32 SiLib::IsEquationSupported(
 
 } // V1
 } // Addr
+} // rocr
+
diff --git a/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h b/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
index 24d49dcced..f6db0de33c 100644
--- a/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
+++ b/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
@@ -37,6 +37,7 @@
 #include "addrlib1.h"
 #include "egbaddrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -341,6 +342,8 @@ private:
 
 } // V1
 } // Addr
+} // rocr
+
 
 #endif