From 4ec8683f24df014dec6eda18d56d28dcb9e426ba Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Fri, 15 May 2015 06:45:28 -0400
Subject: [PATCH] P4 to Git Change 1151344 by nhaustov@nhaustov_hsa1 on
 2015/05/15 06:37:04

	ECR #333756 - Avoid including sys/param.h in libelf.h to avoid name conflict with SC sources.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/elf_update.c#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/libelf.h#10 edit
---
 rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c | 2 ++
 rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c | 2 ++
 rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h     | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c b/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c
index 2f50a20200..c9ee0525d9 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c
@@ -31,6 +31,8 @@
 
 #ifdef ANDROID
 #include "roundup.h"
+#else
+#include <sys/param.h>
 #endif
 
 LIBELF_VCSID("$Id: elf_strptr.c 189 2008-07-20 10:38:08Z jkoshy $");
diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c b/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c
index d93f61046a..30709a9b8f 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c
@@ -54,6 +54,8 @@
 
 #ifdef ANDROID
 #include "roundup.h"
+#else
+#include <sys/param.h>
 #endif
 
 LIBELF_VCSID("$Id: elf_update.c 1922 2011-09-23 08:04:33Z jkoshy $");
diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
index c7ac45e6d7..a3adf744c2 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
@@ -29,7 +29,6 @@
 #ifndef	_LIBELF_H_
 #define	_LIBELF_H_
 
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <elfdefinitions.h>
 #ifdef ANDROID