diff --git a/ocml/src/acoshD.cl b/ocml/src/acoshD.cl
index 619f35a5..064897ff 100644
--- a/ocml/src/acoshD.cl
+++ b/ocml/src/acoshD.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR double MATH_PRIVATE(lnep)(double2 x);
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(acosh)(double x)
 {
     bool b = x >= 0x1.0p+512;
diff --git a/ocml/src/acoshF.cl b/ocml/src/acoshF.cl
index 179b413d..962e0e39 100644
--- a/ocml/src/acoshF.cl
+++ b/ocml/src/acoshF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(lnep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(acosh)(float x)
 {
     bool b = x >= 0x1.0p+64f;
diff --git a/ocml/src/acoshH.cl b/ocml/src/acoshH.cl
index 074a7166..a8dc827e 100644
--- a/ocml/src/acoshH.cl
+++ b/ocml/src/acoshH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(acosh)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(acosh)(half hx)
 {
     half ret;
diff --git a/ocml/src/addD.cl b/ocml/src/addD.cl
index 9e85367d..1cb4d527 100644
--- a/ocml/src/addD.cl
+++ b/ocml/src/addD.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double x, double y) \
 { \
     return BUILTIN_FULL_BINARY(fadd, false, ROUND, x, y); \
diff --git a/ocml/src/addF.cl b/ocml/src/addF.cl
index 8e676725..d01f0c28 100644
--- a/ocml/src/addF.cl
+++ b/ocml/src/addF.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float x, float y) \
 { \
     float ret; \
diff --git a/ocml/src/addH.cl b/ocml/src/addH.cl
index b540fdfe..8df6e2fa 100644
--- a/ocml/src/addH.cl
+++ b/ocml/src/addH.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half x, half y) \
 { \
     return BUILTIN_FULL_BINARY(faddh, false, ROUND, x, y); \
diff --git a/ocml/src/asinhD.cl b/ocml/src/asinhD.cl
index 75c3408a..09957fcc 100644
--- a/ocml/src/asinhD.cl
+++ b/ocml/src/asinhD.cl
@@ -13,7 +13,7 @@
 extern CONSTATTR double MATH_PRIVATE(lnep)(double2 x);
 
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(asinh)(double x)
 {
     double y = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/asinhF.cl b/ocml/src/asinhF.cl
index 407d9545..f5eeaf04 100644
--- a/ocml/src/asinhF.cl
+++ b/ocml/src/asinhF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(lnep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(asinh)(float x)
 {
     float y = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/asinhH.cl b/ocml/src/asinhH.cl
index 027aed99..ae994c76 100644
--- a/ocml/src/asinhH.cl
+++ b/ocml/src/asinhH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(asinh)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(asinh)(half hx)
 {
     half ret;
diff --git a/ocml/src/atanF.cl b/ocml/src/atanF.cl
index ad3cdb03..08a7b1b1 100644
--- a/ocml/src/atanF.cl
+++ b/ocml/src/atanF.cl
@@ -9,7 +9,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(atanred)(float);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(atan)(float x)
 {
     float v = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/atanH.cl b/ocml/src/atanH.cl
index 9fe95d8c..42ba6898 100644
--- a/ocml/src/atanH.cl
+++ b/ocml/src/atanH.cl
@@ -11,7 +11,7 @@ extern CONSTATTR half MATH_PRIVATE(atanred)(half);
 
 CONSTATTR UGEN(atan)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(atan)(half x)
 {
     half v = BUILTIN_ABS_F16(x);
diff --git a/ocml/src/atanhD.cl b/ocml/src/atanhD.cl
index c044f71a..62d9ddb1 100644
--- a/ocml/src/atanhD.cl
+++ b/ocml/src/atanhD.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR double MATH_PRIVATE(lnep)(double2 x);
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(atanh)(double x)
 {
     double y = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/atanhF.cl b/ocml/src/atanhF.cl
index 82a5c3ab..817ed41a 100644
--- a/ocml/src/atanhF.cl
+++ b/ocml/src/atanhF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(lnep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(atanh)(float x)
 {
     float y = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/atanhH.cl b/ocml/src/atanhH.cl
index 46c30ff8..c86722cd 100644
--- a/ocml/src/atanhH.cl
+++ b/ocml/src/atanhH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(atanh)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(atanh)(half hx)
 {
     half ret;
diff --git a/ocml/src/atanpiF.cl b/ocml/src/atanpiF.cl
index f9af9b72..1c46c155 100644
--- a/ocml/src/atanpiF.cl
+++ b/ocml/src/atanpiF.cl
@@ -9,7 +9,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(atanpired)(float);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(atanpi)(float x)
 {
     float v = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/atanpiH.cl b/ocml/src/atanpiH.cl
index d85fe700..44cb201c 100644
--- a/ocml/src/atanpiH.cl
+++ b/ocml/src/atanpiH.cl
@@ -12,7 +12,7 @@ extern CONSTATTR half MATH_PRIVATE(atanpired)(half);
 
 CONSTATTR UGEN(atanpi)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(atanpi)(half x)
 {
     half v = BUILTIN_ABS_F16(x);
diff --git a/ocml/src/atanpiredF.cl b/ocml/src/atanpiredF.cl
index d982869a..63af0f76 100644
--- a/ocml/src/atanpiredF.cl
+++ b/ocml/src/atanpiredF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(atanpired)(float v)
 {
     float t = v * v;
diff --git a/ocml/src/atanpiredH.cl b/ocml/src/atanpiredH.cl
index 121d304f..3eabd599 100644
--- a/ocml/src/atanpiredH.cl
+++ b/ocml/src/atanpiredH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_PRIVATE(atanpired)(half v)
 {
     half t = v * v;
diff --git a/ocml/src/atanredF.cl b/ocml/src/atanredF.cl
index 10b5c5c1..a0895928 100644
--- a/ocml/src/atanredF.cl
+++ b/ocml/src/atanredF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(atanred)(float v)
 {
     float t = v * v;
diff --git a/ocml/src/atanredH.cl b/ocml/src/atanredH.cl
index dd2d1ba9..d721edb3 100644
--- a/ocml/src/atanredH.cl
+++ b/ocml/src/atanredH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_PRIVATE(atanred)(half v)
 {
     half t = v * v;
diff --git a/ocml/src/ba0D.cl b/ocml/src/ba0D.cl
index c21d308b..e87226bc 100644
--- a/ocml/src/ba0D.cl
+++ b/ocml/src/ba0D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_PRIVATE(ba0)(double t)
 {
     return
diff --git a/ocml/src/ba0F.cl b/ocml/src/ba0F.cl
index fc18577f..309ad267 100644
--- a/ocml/src/ba0F.cl
+++ b/ocml/src/ba0F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(ba0)(float t)
 {
     return
diff --git a/ocml/src/ba1D.cl b/ocml/src/ba1D.cl
index c735f595..d4453e00 100644
--- a/ocml/src/ba1D.cl
+++ b/ocml/src/ba1D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_PRIVATE(ba1)(double t)
 {
     return
diff --git a/ocml/src/ba1F.cl b/ocml/src/ba1F.cl
index 2b974a39..5dd1ea96 100644
--- a/ocml/src/ba1F.cl
+++ b/ocml/src/ba1F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(ba1)(float t)
 {
     return
diff --git a/ocml/src/bp0D.cl b/ocml/src/bp0D.cl
index 0e08cb4b..9014ae9e 100644
--- a/ocml/src/bp0D.cl
+++ b/ocml/src/bp0D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_PRIVATE(bp0)(double t)
 {
     return
diff --git a/ocml/src/bp0F.cl b/ocml/src/bp0F.cl
index da6b9b4f..c0c27a1f 100644
--- a/ocml/src/bp0F.cl
+++ b/ocml/src/bp0F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(bp0)(float t)
 {
     return
diff --git a/ocml/src/bp1D.cl b/ocml/src/bp1D.cl
index 55ace155..c9239c95 100644
--- a/ocml/src/bp1D.cl
+++ b/ocml/src/bp1D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_PRIVATE(bp1)(double t)
 {
     return
diff --git a/ocml/src/bp1F.cl b/ocml/src/bp1F.cl
index 3267c7f4..18569cb6 100644
--- a/ocml/src/bp1F.cl
+++ b/ocml/src/bp1F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(bp1)(float t)
 {
     return
diff --git a/ocml/src/cbrtD.cl b/ocml/src/cbrtD.cl
index 67cd2628..fd83a2fb 100644
--- a/ocml/src/cbrtD.cl
+++ b/ocml/src/cbrtD.cl
@@ -1,7 +1,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(cbrt)(double x)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/cbrtF.cl b/ocml/src/cbrtF.cl
index cab2df26..5e436900 100644
--- a/ocml/src/cbrtF.cl
+++ b/ocml/src/cbrtF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(cbrt)(float x)
 {
     if (DAZ_OPT()) {
diff --git a/ocml/src/ceilD.cl b/ocml/src/ceilD.cl
index dc2eb8dc..654226cc 100644
--- a/ocml/src/ceilD.cl
+++ b/ocml/src/ceilD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(ceil)(double x)
 {
     return BUILTIN_CEIL_F64(x);
diff --git a/ocml/src/ceilF.cl b/ocml/src/ceilF.cl
index 2a563cdf..8b1600c8 100644
--- a/ocml/src/ceilF.cl
+++ b/ocml/src/ceilF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(ceil)(float x)
 {
     return BUILTIN_CEIL_F32(x);
diff --git a/ocml/src/ceilH.cl b/ocml/src/ceilH.cl
index 2db7385c..5b9804cb 100644
--- a/ocml/src/ceilH.cl
+++ b/ocml/src/ceilH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(ceil)(half2 x)
 {
     return BUILTIN_CEIL_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(ceil)(half x)
 {
     return BUILTIN_CEIL_F16(x);
diff --git a/ocml/src/copysignD.cl b/ocml/src/copysignD.cl
index 5c2eb066..b239b793 100644
--- a/ocml/src/copysignD.cl
+++ b/ocml/src/copysignD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(copysign)(double x, double y)
 {
     return BUILTIN_COPYSIGN_F64(x, y);
diff --git a/ocml/src/copysignF.cl b/ocml/src/copysignF.cl
index 87bc68d7..f2fac4ab 100644
--- a/ocml/src/copysignF.cl
+++ b/ocml/src/copysignF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(copysign)(float x, float y)
 {
     return BUILTIN_COPYSIGN_F32(x, y);
diff --git a/ocml/src/copysignH.cl b/ocml/src/copysignH.cl
index f89c061c..7897b1e3 100644
--- a/ocml/src/copysignH.cl
+++ b/ocml/src/copysignH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(copysign)(half2 x, half2 y)
 {
     return BUILTIN_COPYSIGN_2F16(x, y);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(copysign)(half x, half y)
 {
     return BUILTIN_COPYSIGN_F16(x, y);
diff --git a/ocml/src/cosD.cl b/ocml/src/cosD.cl
index 12a43884..b76adff9 100644
--- a/ocml/src/cosD.cl
+++ b/ocml/src/cosD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(cos)(double x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/cosF.cl b/ocml/src/cosF.cl
index a0768dd2..60c57195 100644
--- a/ocml/src/cosF.cl
+++ b/ocml/src/cosF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(cos)(float x)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/cosH.cl b/ocml/src/cosH.cl
index 3aa1295b..e4edc273 100644
--- a/ocml/src/cosH.cl
+++ b/ocml/src/cosH.cl
@@ -10,7 +10,7 @@
 
 UGEN(cos)
 
-INLINEATTR half
+half
 MATH_MANGLE(cos)(half x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/cosbD.cl b/ocml/src/cosbD.cl
index 49ca4e7f..0838b618 100644
--- a/ocml/src/cosbD.cl
+++ b/ocml/src/cosbD.cl
@@ -24,7 +24,7 @@
         L = __e; \
     } while (0)
 
-INLINEATTR double
+double
 MATH_PRIVATE(cosb)(double x, int n, double p)
 {
     struct redret r = MATH_PRIVATE(trigred)(x);
diff --git a/ocml/src/cosbF.cl b/ocml/src/cosbF.cl
index 34e5d857..60e1f415 100644
--- a/ocml/src/cosbF.cl
+++ b/ocml/src/cosbF.cl
@@ -24,7 +24,7 @@
         L = __e; \
     } while (0)
 
-INLINEATTR float
+float
 MATH_PRIVATE(cosb)(float x, int n, float p)
 {
     struct redret r = MATH_PRIVATE(trigred)(x);
diff --git a/ocml/src/coshD.cl b/ocml/src/coshD.cl
index fe1a676d..da1c54a4 100644
--- a/ocml/src/coshD.cl
+++ b/ocml/src/coshD.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR double2 MATH_PRIVATE(epexpep)(double2 x);
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(cosh)(double x)
 {
     x = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/coshF.cl b/ocml/src/coshF.cl
index 425bea9d..ef4c46da 100644
--- a/ocml/src/coshF.cl
+++ b/ocml/src/coshF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float2 MATH_PRIVATE(epexpep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(cosh)(float x)
 {
     x = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/coshH.cl b/ocml/src/coshH.cl
index 232b8f67..3ddea219 100644
--- a/ocml/src/coshH.cl
+++ b/ocml/src/coshH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(cosh)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(cosh)(half hx)
 {
     float x = (float)hx * 0x1.715476p+0f;
diff --git a/ocml/src/cospiD.cl b/ocml/src/cospiD.cl
index ef407179..fab3bc4d 100644
--- a/ocml/src/cospiD.cl
+++ b/ocml/src/cospiD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(cospi)(double x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/cospiF.cl b/ocml/src/cospiF.cl
index 6891ba87..90d360d0 100644
--- a/ocml/src/cospiF.cl
+++ b/ocml/src/cospiF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(cospi)(float x)
 {
     int ax = AS_INT(x) & 0x7fffffff;
diff --git a/ocml/src/cospiH.cl b/ocml/src/cospiH.cl
index e4b74521..3f55c79e 100644
--- a/ocml/src/cospiH.cl
+++ b/ocml/src/cospiH.cl
@@ -10,7 +10,7 @@
 
 UGEN(cospi)
 
-INLINEATTR half
+half
 MATH_MANGLE(cospi)(half x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/divD.cl b/ocml/src/divD.cl
index 27ae4318..eed7cbb7 100644
--- a/ocml/src/divD.cl
+++ b/ocml/src/divD.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double x, double y) \
 { \
     return BUILTIN_FULL_BINARY(fdiv, false, ROUND, x, y); \
diff --git a/ocml/src/divF.cl b/ocml/src/divF.cl
index 9dcfb511..e0c7b961 100644
--- a/ocml/src/divF.cl
+++ b/ocml/src/divF.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float x, float y) \
 { \
     float ret; \
diff --git a/ocml/src/divH.cl b/ocml/src/divH.cl
index 7ac66449..927784b1 100644
--- a/ocml/src/divH.cl
+++ b/ocml/src/divH.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half x, half y) \
 { \
     return BUILTIN_FULL_BINARY(fdivh, false, ROUND, x, y); \
diff --git a/ocml/src/epexpepD.cl b/ocml/src/epexpepD.cl
index 292a61b9..f6340e15 100644
--- a/ocml/src/epexpepD.cl
+++ b/ocml/src/epexpepD.cl
@@ -10,7 +10,7 @@
 #define DOUBLE_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR double2
+CONSTATTR double2
 MATH_PRIVATE(epexpep)(double2 x)
 {
     double dn = BUILTIN_RINT_F64(x.hi * 0x1.71547652b82fep+0);
diff --git a/ocml/src/epexpepF.cl b/ocml/src/epexpepF.cl
index abeecc70..1ba48e10 100644
--- a/ocml/src/epexpepF.cl
+++ b/ocml/src/epexpepF.cl
@@ -10,7 +10,7 @@
 #define FLOAT_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR float2
+CONSTATTR float2
 MATH_PRIVATE(epexpep)(float2 x)
 {
     float fn = BUILTIN_RINT_F32(x.hi * 0x1.715476p+0f);
diff --git a/ocml/src/eplnD.cl b/ocml/src/eplnD.cl
index f16b4071..7540e5b9 100644
--- a/ocml/src/eplnD.cl
+++ b/ocml/src/eplnD.cl
@@ -10,7 +10,7 @@
 #define DOUBLE_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR double2
+CONSTATTR double2
 MATH_PRIVATE(epln)(double a)
 {
     double m = BUILTIN_FREXP_MANT_F64(a);
diff --git a/ocml/src/eplnF.cl b/ocml/src/eplnF.cl
index 9063d677..b7fef2be 100644
--- a/ocml/src/eplnF.cl
+++ b/ocml/src/eplnF.cl
@@ -10,7 +10,7 @@
 #define FLOAT_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR float2
+CONSTATTR float2
 MATH_PRIVATE(epln)(float a)
 {
     float m = BUILTIN_FREXP_MANT_F32(a);
diff --git a/ocml/src/erfH.cl b/ocml/src/erfH.cl
index 883509d8..47c3c353 100644
--- a/ocml/src/erfH.cl
+++ b/ocml/src/erfH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(erf)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(erf)(half x)
 {
     return (half)MATH_UPMANGLE(erf)((float)x);
diff --git a/ocml/src/erfcH.cl b/ocml/src/erfcH.cl
index 2adc0236..ec7c7b04 100644
--- a/ocml/src/erfcH.cl
+++ b/ocml/src/erfcH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(erfc)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(erfc)(half x)
 {
     return (half)MATH_UPMANGLE(erfc)((float)x);
diff --git a/ocml/src/erfcinvH.cl b/ocml/src/erfcinvH.cl
index 8050709b..6258a9b9 100644
--- a/ocml/src/erfcinvH.cl
+++ b/ocml/src/erfcinvH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(erfcinv)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(erfcinv)(half x)
 {
     return (half)MATH_UPMANGLE(erfcinv)((float)x);
diff --git a/ocml/src/erfcxH.cl b/ocml/src/erfcxH.cl
index eb064e47..9fa79b5f 100644
--- a/ocml/src/erfcxH.cl
+++ b/ocml/src/erfcxH.cl
@@ -3,7 +3,7 @@
 
 PUREATTR UGEN(erfcx)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(erfcx)(half x)
 {
     return (half)MATH_UPMANGLE(erfcx)((float)x);
diff --git a/ocml/src/erfinvH.cl b/ocml/src/erfinvH.cl
index 60238709..18317b51 100644
--- a/ocml/src/erfinvH.cl
+++ b/ocml/src/erfinvH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(erfinv)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(erfinv)(half x)
 {
     return (half)MATH_UPMANGLE(erfinv)((float)x);
diff --git a/ocml/src/exp10H.cl b/ocml/src/exp10H.cl
index d376414e..94a50ce2 100644
--- a/ocml/src/exp10H.cl
+++ b/ocml/src/exp10H.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(exp10)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(exp10)(half x)
 {
     return (half)BUILTIN_EXP2_F32((float)x * 0x1.a934f0p+1f);
diff --git a/ocml/src/exp2H.cl b/ocml/src/exp2H.cl
index a8b72ff3..b6afa724 100644
--- a/ocml/src/exp2H.cl
+++ b/ocml/src/exp2H.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(exp2)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(exp2)(half x)
 {
     return BUILTIN_EXP2_F16(x);
diff --git a/ocml/src/expF_base.h b/ocml/src/expF_base.h
index 9c42d5fe..08bde388 100644
--- a/ocml/src/expF_base.h
+++ b/ocml/src/expF_base.h
@@ -32,7 +32,7 @@
 // 
 //    e^x = (2^m) * ( (2^(j/64)) + q*(2^(j/64)) ) 
 
-PUREATTR INLINEATTR float
+PUREATTR float
 #if defined COMPILING_EXP2
 MATH_MANGLE(exp2)(float x)
 #elif defined COMPILING_EXP10
diff --git a/ocml/src/expH.cl b/ocml/src/expH.cl
index 1ff4a024..caa3a4ac 100644
--- a/ocml/src/expH.cl
+++ b/ocml/src/expH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(exp)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(exp)(half x)
 {
     return (half)BUILTIN_EXP2_F32((float)x * 0x1.715476p+0f);
diff --git a/ocml/src/expepD.cl b/ocml/src/expepD.cl
index f8d4fd95..859a023d 100644
--- a/ocml/src/expepD.cl
+++ b/ocml/src/expepD.cl
@@ -10,7 +10,7 @@
 #define DOUBLE_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR double
+CONSTATTR double
 MATH_PRIVATE(expep)(double2 x)
 {
     double dn = BUILTIN_RINT_F64(x.hi * 0x1.71547652b82fep+0);
diff --git a/ocml/src/expepF.cl b/ocml/src/expepF.cl
index bf585b47..657267a2 100644
--- a/ocml/src/expepF.cl
+++ b/ocml/src/expepF.cl
@@ -10,7 +10,7 @@
 #define FLOAT_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR float
+CONSTATTR float
 MATH_PRIVATE(expep)(float2 x)
 {
     float fn = BUILTIN_RINT_F32(x.hi * 0x1.715476p+0f);
diff --git a/ocml/src/expm1F.cl b/ocml/src/expm1F.cl
index 583a7a11..31ac3b89 100644
--- a/ocml/src/expm1F.cl
+++ b/ocml/src/expm1F.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float2 MATH_PRIVATE(epexpep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(expm1)(float x)
 {
     float2 e = sub(MATH_PRIVATE(epexpep)(con(x, 0.0f)), 1.0f);
diff --git a/ocml/src/expm1H.cl b/ocml/src/expm1H.cl
index c04c6c84..79498be4 100644
--- a/ocml/src/expm1H.cl
+++ b/ocml/src/expm1H.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(expm1)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(expm1)(half x)
 {
     half ret;
diff --git a/ocml/src/fabsD.cl b/ocml/src/fabsD.cl
index 2c5332c6..9052cd01 100644
--- a/ocml/src/fabsD.cl
+++ b/ocml/src/fabsD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(fabs)(double x)
 {
     return BUILTIN_ABS_F64(x);
diff --git a/ocml/src/fabsF.cl b/ocml/src/fabsF.cl
index 444e9075..957cb79f 100644
--- a/ocml/src/fabsF.cl
+++ b/ocml/src/fabsF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(fabs)(float x)
 {
     return BUILTIN_ABS_F32(x);
diff --git a/ocml/src/fabsH.cl b/ocml/src/fabsH.cl
index 9cd7dbbd..1504bb6a 100644
--- a/ocml/src/fabsH.cl
+++ b/ocml/src/fabsH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(fabs)(half2 x)
 {
     return BUILTIN_ABS_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(fabs)(half x)
 {
     return BUILTIN_ABS_F16(x);
diff --git a/ocml/src/fdimD.cl b/ocml/src/fdimD.cl
index 8214203e..cc7255c3 100644
--- a/ocml/src/fdimD.cl
+++ b/ocml/src/fdimD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(fdim)(double x, double y)
 {
     long d = AS_LONG(x - y);
diff --git a/ocml/src/fdimF.cl b/ocml/src/fdimF.cl
index 9e418b24..968eb908 100644
--- a/ocml/src/fdimF.cl
+++ b/ocml/src/fdimF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(fdim)(float x, float y)
 {
     if (!FINITE_ONLY_OPT()) {
diff --git a/ocml/src/fdimH.cl b/ocml/src/fdimH.cl
index 304c96ab..989f8213 100644
--- a/ocml/src/fdimH.cl
+++ b/ocml/src/fdimH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(fdim)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(fdim)(half x, half y)
 {
     if (!FINITE_ONLY_OPT()) {
diff --git a/ocml/src/floorD.cl b/ocml/src/floorD.cl
index 8fd637da..2fc2375d 100644
--- a/ocml/src/floorD.cl
+++ b/ocml/src/floorD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(floor)(double x)
 {
     return BUILTIN_FLOOR_F64(x);
diff --git a/ocml/src/floorF.cl b/ocml/src/floorF.cl
index 3364960a..e8b6d3ef 100644
--- a/ocml/src/floorF.cl
+++ b/ocml/src/floorF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(floor)(float x)
 {
     return BUILTIN_FLOOR_F32(x);
diff --git a/ocml/src/floorH.cl b/ocml/src/floorH.cl
index 16c84eee..f563e648 100644
--- a/ocml/src/floorH.cl
+++ b/ocml/src/floorH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(floor)(half2 x)
 {
     return BUILTIN_FLOOR_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(floor)(half x)
 {
     return BUILTIN_FLOOR_F16(x);
diff --git a/ocml/src/fmaD.cl b/ocml/src/fmaD.cl
index 15d596dc..61a47ea5 100644
--- a/ocml/src/fmaD.cl
+++ b/ocml/src/fmaD.cl
@@ -17,7 +17,7 @@ MATH_MANGLE(fma)(double a, double b, double c)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double a, double b, double c) \
 { \
     return BUILTIN_FULL_TERNARY(ffma, false, ROUND, a, b, c); \
diff --git a/ocml/src/fmaF.cl b/ocml/src/fmaF.cl
index 3974f317..bf45492c 100644
--- a/ocml/src/fmaF.cl
+++ b/ocml/src/fmaF.cl
@@ -17,7 +17,7 @@ MATH_MANGLE(fma)(float a, float b, float c)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float a, float b, float c) \
 { \
     float ret; \
diff --git a/ocml/src/fmaH.cl b/ocml/src/fmaH.cl
index c34f1781..98320551 100644
--- a/ocml/src/fmaH.cl
+++ b/ocml/src/fmaH.cl
@@ -23,7 +23,7 @@ MATH_MANGLE(fma)(half a, half b, half c)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half a, half b, half c) \
 { \
     return BUILTIN_FULL_TERNARY(ffmah, false, ROUND, a, b, c); \
diff --git a/ocml/src/fmaxD.cl b/ocml/src/fmaxD.cl
index 97a80466..fa8fc448 100644
--- a/ocml/src/fmaxD.cl
+++ b/ocml/src/fmaxD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(fmax)(double x, double y)
 {
     return BUILTIN_MAX_F64(BUILTIN_CANONICALIZE_F64(x), BUILTIN_CANONICALIZE_F64(y));
diff --git a/ocml/src/fmaxF.cl b/ocml/src/fmaxF.cl
index d96a4c34..7fa39a8a 100644
--- a/ocml/src/fmaxF.cl
+++ b/ocml/src/fmaxF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(fmax)(float x, float y)
 {
     float ret;
diff --git a/ocml/src/fmaxH.cl b/ocml/src/fmaxH.cl
index f6817006..552be89f 100644
--- a/ocml/src/fmaxH.cl
+++ b/ocml/src/fmaxH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(fmax)(half2 x, half2 y)
 {
     return BUILTIN_MAX_2F16(BUILTIN_CANONICALIZE_2F16(x), BUILTIN_CANONICALIZE_2F16(y));
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(fmax)(half x, half y)
 {
     return BUILTIN_MAX_F16(BUILTIN_CANONICALIZE_F16(x), BUILTIN_CANONICALIZE_F16(y));
diff --git a/ocml/src/fminD.cl b/ocml/src/fminD.cl
index 0ff01127..04fba1fb 100644
--- a/ocml/src/fminD.cl
+++ b/ocml/src/fminD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(fmin)(double x, double y)
 {
     return BUILTIN_MIN_F64(BUILTIN_CANONICALIZE_F64(x), BUILTIN_CANONICALIZE_F64(y));
diff --git a/ocml/src/fminF.cl b/ocml/src/fminF.cl
index ffd6f40a..e979e18e 100644
--- a/ocml/src/fminF.cl
+++ b/ocml/src/fminF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(fmin)(float x, float y)
 {
     float ret;
diff --git a/ocml/src/fminH.cl b/ocml/src/fminH.cl
index 6da1fb55..76398429 100644
--- a/ocml/src/fminH.cl
+++ b/ocml/src/fminH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(fmin)(half2 x, half2 y)
 {
     return BUILTIN_MIN_2F16(BUILTIN_CANONICALIZE_2F16(x), BUILTIN_CANONICALIZE_2F16(y));
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(fmin)(half x, half y)
 {
     return BUILTIN_MIN_F16(BUILTIN_CANONICALIZE_F16(x), BUILTIN_CANONICALIZE_F16(y));
diff --git a/ocml/src/fpclassifyD.cl b/ocml/src/fpclassifyD.cl
index cfefa9d5..8db6b992 100644
--- a/ocml/src/fpclassifyD.cl
+++ b/ocml/src/fpclassifyD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(fpclassify)(double x)
 {
     int ret = BUILTIN_CLASS_F64(x, CLASS_PINF|CLASS_NINF) ? FP_INFINITE : FP_NAN;
diff --git a/ocml/src/fpclassifyF.cl b/ocml/src/fpclassifyF.cl
index 824c140e..50a84783 100644
--- a/ocml/src/fpclassifyF.cl
+++ b/ocml/src/fpclassifyF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(fpclassify)(float x)
 {
     int ret = BUILTIN_CLASS_F32(x, CLASS_PINF|CLASS_NINF) ? FP_INFINITE : FP_NAN;
diff --git a/ocml/src/fpclassifyH.cl b/ocml/src/fpclassifyH.cl
index 20d34897..a9c2d928 100644
--- a/ocml/src/fpclassifyH.cl
+++ b/ocml/src/fpclassifyH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(fpclassify)(half x)
 {
     int ret = BUILTIN_CLASS_F16(x, CLASS_PINF|CLASS_NINF) ? FP_INFINITE : FP_NAN;
diff --git a/ocml/src/fractD.cl b/ocml/src/fractD.cl
index 720e3e23..e4b75aec 100644
--- a/ocml/src/fractD.cl
+++ b/ocml/src/fractD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(fract)(double x, __private double *ip)
 {
     double i = BUILTIN_FLOOR_F64(x);
diff --git a/ocml/src/fractF.cl b/ocml/src/fractF.cl
index 9b03b797..b65b517c 100644
--- a/ocml/src/fractF.cl
+++ b/ocml/src/fractF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(fract)(float x, __private float *ip)
 {
     float i = BUILTIN_FLOOR_F32(x);
diff --git a/ocml/src/fractH.cl b/ocml/src/fractH.cl
index ba127717..2cda3a5c 100644
--- a/ocml/src/fractH.cl
+++ b/ocml/src/fractH.cl
@@ -7,14 +7,14 @@
 
 #include "mathH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(fract)(half2 x, __private half2 *ip)
 {
     *ip = BUILTIN_FLOOR_2F16(x);
     return (half2)(BUILTIN_FRACTION_F16(x.lo), BUILTIN_FRACTION_F16(x.hi));
 }
 
-INLINEATTR half
+half
 MATH_MANGLE(fract)(half x, __private half *ip)
 {
     *ip = BUILTIN_FLOOR_F16(x);
diff --git a/ocml/src/frexpD.cl b/ocml/src/frexpD.cl
index b3deeb64..4f9d252d 100644
--- a/ocml/src/frexpD.cl
+++ b/ocml/src/frexpD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(frexp)(double x, __private int *ep)
 {
     int e = BUILTIN_FREXP_EXP_F64(x);
diff --git a/ocml/src/frexpF.cl b/ocml/src/frexpF.cl
index e29554ba..c5b0b84b 100644
--- a/ocml/src/frexpF.cl
+++ b/ocml/src/frexpF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(frexp)(float x, __private int *ep)
 {
     int e = BUILTIN_FREXP_EXP_F32(x);
diff --git a/ocml/src/frexpH.cl b/ocml/src/frexpH.cl
index a5e43691..a4bc6e3c 100644
--- a/ocml/src/frexpH.cl
+++ b/ocml/src/frexpH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(frexp)(half2 x, __private int2 *ep)
 {
     int elo, ehi;
@@ -18,7 +18,7 @@ MATH_MANGLE2(frexp)(half2 x, __private int2 *ep)
     return r;
 }
 
-INLINEATTR half
+half
 MATH_MANGLE(frexp)(half x, __private int *ep)
 {
     int e = (int)BUILTIN_FREXP_EXP_F16(x);
diff --git a/ocml/src/hypotD.cl b/ocml/src/hypotD.cl
index 405720f4..fd99614a 100644
--- a/ocml/src/hypotD.cl
+++ b/ocml/src/hypotD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(hypot)(double x, double y)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/hypotF.cl b/ocml/src/hypotF.cl
index adca99ea..2b697a32 100644
--- a/ocml/src/hypotF.cl
+++ b/ocml/src/hypotF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(hypot)(float x, float y)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/hypotH.cl b/ocml/src/hypotH.cl
index dc0dad36..66b7811a 100644
--- a/ocml/src/hypotH.cl
+++ b/ocml/src/hypotH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(hypot)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(hypot)(half x, half y)
 {
     float fx = (float)x;
diff --git a/ocml/src/i0H.cl b/ocml/src/i0H.cl
index f42f1482..913942f5 100644
--- a/ocml/src/i0H.cl
+++ b/ocml/src/i0H.cl
@@ -9,7 +9,7 @@
 
 UGEN(i0)
 
-INLINEATTR half
+half
 MATH_MANGLE(i0)(half x)
 {
     return (half)MATH_UPMANGLE(i0)((float)x);
diff --git a/ocml/src/i1H.cl b/ocml/src/i1H.cl
index 09b74c6d..d778626b 100644
--- a/ocml/src/i1H.cl
+++ b/ocml/src/i1H.cl
@@ -9,7 +9,7 @@
 
 UGEN(i1)
 
-INLINEATTR half
+half
 MATH_MANGLE(i1)(half x)
 {
     return (half)MATH_UPMANGLE(i1)((float)x);
diff --git a/ocml/src/ilogbD.cl b/ocml/src/ilogbD.cl
index 95ce66fc..0f0b9ace 100644
--- a/ocml/src/ilogbD.cl
+++ b/ocml/src/ilogbD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(ilogb)(double x)
 {
     int r = BUILTIN_FREXP_EXP_F64(x) - 1;
diff --git a/ocml/src/ilogbF.cl b/ocml/src/ilogbF.cl
index e84537b8..1a7e1d1d 100644
--- a/ocml/src/ilogbF.cl
+++ b/ocml/src/ilogbF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(ilogb)(float x)
 {
     int r = BUILTIN_FREXP_EXP_F32(x) - 1;
diff --git a/ocml/src/ilogbH.cl b/ocml/src/ilogbH.cl
index a5aeef18..d7a274e4 100644
--- a/ocml/src/ilogbH.cl
+++ b/ocml/src/ilogbH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR int2
+CONSTATTR int2
 MATH_MANGLE2(ilogb)(half2 x)
 {
     return (int2)(MATH_MANGLE(ilogb)(x.lo), MATH_MANGLE(ilogb)(x.hi));
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(ilogb)(half x)
 {
     int r = (int)BUILTIN_FREXP_EXP_F16(x) - 1;
diff --git a/ocml/src/isfiniteD.cl b/ocml/src/isfiniteD.cl
index 489a390f..bdca20d5 100644
--- a/ocml/src/isfiniteD.cl
+++ b/ocml/src/isfiniteD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isfinite)(double x)
 {
     return BUILTIN_CLASS_F64(x, CLASS_NNOR|CLASS_NSUB|CLASS_NZER|CLASS_PZER|CLASS_PSUB|CLASS_PNOR);
diff --git a/ocml/src/isfiniteF.cl b/ocml/src/isfiniteF.cl
index 11227450..421ab1a1 100644
--- a/ocml/src/isfiniteF.cl
+++ b/ocml/src/isfiniteF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isfinite)(float x)
 {
     return BUILTIN_CLASS_F32(x, CLASS_NNOR|CLASS_NSUB|CLASS_NZER|CLASS_PZER|CLASS_PSUB|CLASS_PNOR);
diff --git a/ocml/src/isfiniteH.cl b/ocml/src/isfiniteH.cl
index c2b62152..dce82701 100644
--- a/ocml/src/isfiniteH.cl
+++ b/ocml/src/isfiniteH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR short2
+CONSTATTR short2
 MATH_MANGLE2(isfinite)(half2 x)
 {
     return (short2)
@@ -15,7 +15,7 @@ MATH_MANGLE2(isfinite)(half2 x)
          BUILTIN_CLASS_F16(x.hi, CLASS_NNOR|CLASS_NSUB|CLASS_NZER|CLASS_PZER|CLASS_PSUB|CLASS_PNOR) ? (short)-1 : (short)0);
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isfinite)(half x)
 {
     return BUILTIN_CLASS_F16(x, CLASS_NNOR|CLASS_NSUB|CLASS_NZER|CLASS_PZER|CLASS_PSUB|CLASS_PNOR);
diff --git a/ocml/src/isinfD.cl b/ocml/src/isinfD.cl
index 00822a9b..bf33343e 100644
--- a/ocml/src/isinfD.cl
+++ b/ocml/src/isinfD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isinf)(double x)
 {
     return BUILTIN_CLASS_F64(x, CLASS_PINF|CLASS_NINF);
diff --git a/ocml/src/isinfF.cl b/ocml/src/isinfF.cl
index 4a0bda85..0a408cd1 100644
--- a/ocml/src/isinfF.cl
+++ b/ocml/src/isinfF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isinf)(float x)
 {
     return BUILTIN_CLASS_F32(x, CLASS_PINF|CLASS_NINF);
diff --git a/ocml/src/isinfH.cl b/ocml/src/isinfH.cl
index db18b9b7..d2978f02 100644
--- a/ocml/src/isinfH.cl
+++ b/ocml/src/isinfH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR short2
+CONSTATTR short2
 MATH_MANGLE2(isinf)(half2 x)
 {
     return (short2)
@@ -15,7 +15,7 @@ MATH_MANGLE2(isinf)(half2 x)
          BUILTIN_CLASS_F16(x.hi, CLASS_PINF|CLASS_NINF) ? (short)-1 : (short)0);
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isinf)(half x)
 {
     return BUILTIN_CLASS_F16(x, CLASS_PINF|CLASS_NINF);
diff --git a/ocml/src/isnanD.cl b/ocml/src/isnanD.cl
index d1f1b03d..12400473 100644
--- a/ocml/src/isnanD.cl
+++ b/ocml/src/isnanD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnan)(double x)
 {
     return BUILTIN_CLASS_F64(x, CLASS_SNAN|CLASS_QNAN);
diff --git a/ocml/src/isnanF.cl b/ocml/src/isnanF.cl
index 5e305755..47fc9910 100644
--- a/ocml/src/isnanF.cl
+++ b/ocml/src/isnanF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnan)(float x)
 {
     return BUILTIN_CLASS_F32(x, CLASS_SNAN|CLASS_QNAN);
diff --git a/ocml/src/isnanH.cl b/ocml/src/isnanH.cl
index 8eb1b8e2..d831c3e8 100644
--- a/ocml/src/isnanH.cl
+++ b/ocml/src/isnanH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR short2
+CONSTATTR short2
 MATH_MANGLE2(isnan)(half2 x)
 {
     return (short2)
@@ -15,7 +15,7 @@ MATH_MANGLE2(isnan)(half2 x)
          BUILTIN_CLASS_F16(x.hi, CLASS_SNAN|CLASS_QNAN) ? (short)-1 : (short)0);
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnan)(half x)
 {
     return BUILTIN_CLASS_F16(x, CLASS_SNAN|CLASS_QNAN);
diff --git a/ocml/src/isnormalD.cl b/ocml/src/isnormalD.cl
index 74907904..55799a17 100644
--- a/ocml/src/isnormalD.cl
+++ b/ocml/src/isnormalD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnormal)(double x)
 {
     return BUILTIN_CLASS_F64(x, CLASS_PNOR|CLASS_NNOR);
diff --git a/ocml/src/isnormalF.cl b/ocml/src/isnormalF.cl
index 2e717e4b..9c640286 100644
--- a/ocml/src/isnormalF.cl
+++ b/ocml/src/isnormalF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnormal)(float x)
 {
     return BUILTIN_CLASS_F32(x, CLASS_PNOR|CLASS_NNOR);
diff --git a/ocml/src/isnormalH.cl b/ocml/src/isnormalH.cl
index 1c0325a3..c33d9092 100644
--- a/ocml/src/isnormalH.cl
+++ b/ocml/src/isnormalH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR short2
+CONSTATTR short2
 MATH_MANGLE2(isnormal)(half2 x)
 {
     return (short2)
@@ -15,7 +15,7 @@ MATH_MANGLE2(isnormal)(half2 x)
          BUILTIN_CLASS_F16(x.hi, CLASS_PNOR|CLASS_NNOR) ? (short)-1 : (short)0);
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(isnormal)(half x)
 {
     return BUILTIN_CLASS_F16(x, CLASS_PNOR|CLASS_NNOR);
diff --git a/ocml/src/j0H.cl b/ocml/src/j0H.cl
index f61b3fca..83feff6f 100644
--- a/ocml/src/j0H.cl
+++ b/ocml/src/j0H.cl
@@ -9,7 +9,7 @@
 
 UGEN(j0)
 
-INLINEATTR half
+half
 MATH_MANGLE(j0)(half x)
 {
     return (half)MATH_UPMANGLE(j0)((float)x);
diff --git a/ocml/src/j1H.cl b/ocml/src/j1H.cl
index 7cbaddf4..557038f2 100644
--- a/ocml/src/j1H.cl
+++ b/ocml/src/j1H.cl
@@ -9,7 +9,7 @@
 
 UGEN(j1)
 
-INLINEATTR half
+half
 MATH_MANGLE(j1)(half x)
 {
     return (half)MATH_UPMANGLE(j1)((float)x);
diff --git a/ocml/src/ldexpD.cl b/ocml/src/ldexpD.cl
index 1cf0e093..7ba48285 100644
--- a/ocml/src/ldexpD.cl
+++ b/ocml/src/ldexpD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(ldexp)(double x, int n)
 {
     return BUILTIN_FLDEXP_F64(x, n);
diff --git a/ocml/src/ldexpF.cl b/ocml/src/ldexpF.cl
index 435848aa..29a1da28 100644
--- a/ocml/src/ldexpF.cl
+++ b/ocml/src/ldexpF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(ldexp)(float x, int n)
 {
     return BUILTIN_FLDEXP_F32(x, n);
diff --git a/ocml/src/ldexpH.cl b/ocml/src/ldexpH.cl
index 7f06e7ef..d4d57043 100644
--- a/ocml/src/ldexpH.cl
+++ b/ocml/src/ldexpH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(ldexp)(half2 x, int2 n)
 {
     return (half2)(MATH_MANGLE(ldexp)(x.lo, n.lo), MATH_MANGLE(ldexp)(x.hi, n.hi));
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(ldexp)(half x, int n)
 {
     return BUILTIN_FLDEXP_F16(x, BUILTIN_CLAMP_S32(n, SHRT_MIN, SHRT_MAX));
diff --git a/ocml/src/len3D.cl b/ocml/src/len3D.cl
index d0c6e811..fee8e9db 100644
--- a/ocml/src/len3D.cl
+++ b/ocml/src/len3D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(len3)(double x, double y, double z)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/len3F.cl b/ocml/src/len3F.cl
index f2ab9125..bb14ee5a 100644
--- a/ocml/src/len3F.cl
+++ b/ocml/src/len3F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(len3)(float x, float y, float z)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/len3H.cl b/ocml/src/len3H.cl
index 32248780..bb6ef92c 100644
--- a/ocml/src/len3H.cl
+++ b/ocml/src/len3H.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(len3)(half x, half y, half z)
 {
     float fx = (float)x;
diff --git a/ocml/src/len4D.cl b/ocml/src/len4D.cl
index 4fe8b898..b05f0cad 100644
--- a/ocml/src/len4D.cl
+++ b/ocml/src/len4D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(len4)(double x, double y, double z, double w)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/len4F.cl b/ocml/src/len4F.cl
index c80e4c0c..24231618 100644
--- a/ocml/src/len4F.cl
+++ b/ocml/src/len4F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(len4)(float x, float y, float z, float w)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/len4H.cl b/ocml/src/len4H.cl
index 6fee1090..9b320c78 100644
--- a/ocml/src/len4H.cl
+++ b/ocml/src/len4H.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(len4)(half x, half y, half z, half w)
 {
     float fx = (float)x;
diff --git a/ocml/src/lgammaD.cl b/ocml/src/lgammaD.cl
index 4a9849e9..69e50258 100644
--- a/ocml/src/lgammaD.cl
+++ b/ocml/src/lgammaD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(lgamma)(double x)
 {
     int s;
diff --git a/ocml/src/lgammaF.cl b/ocml/src/lgammaF.cl
index 2f53d18c..4a113c1d 100644
--- a/ocml/src/lgammaF.cl
+++ b/ocml/src/lgammaF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(lgamma)(float x)
 {
     int s;
diff --git a/ocml/src/lgammaH.cl b/ocml/src/lgammaH.cl
index 6472f9f6..81a0fcec 100644
--- a/ocml/src/lgammaH.cl
+++ b/ocml/src/lgammaH.cl
@@ -9,7 +9,7 @@
 
 UGEN(lgamma)
 
-INLINEATTR half
+half
 MATH_MANGLE(lgamma)(half x)
 {
     int s;
diff --git a/ocml/src/lgamma_rH.cl b/ocml/src/lgamma_rH.cl
index 377721d9..b1f6d485 100644
--- a/ocml/src/lgamma_rH.cl
+++ b/ocml/src/lgamma_rH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(lgamma_r)(half2 x, __private int2 *signp)
 {
     int slo, shi;
@@ -18,7 +18,7 @@ MATH_MANGLE2(lgamma_r)(half2 x, __private int2 *signp)
     return r;
 }
 
-INLINEATTR half
+half
 MATH_MANGLE(lgamma_r)(half x, __private int *signp)
 {
     return (half)MATH_UPMANGLE(lgamma_r)((float)x, signp);
diff --git a/ocml/src/lnepD.cl b/ocml/src/lnepD.cl
index 6bece3e7..dfe4484d 100644
--- a/ocml/src/lnepD.cl
+++ b/ocml/src/lnepD.cl
@@ -10,7 +10,7 @@
 #define DOUBLE_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR double
+CONSTATTR double
 MATH_PRIVATE(lnep)(double2 a)
 {
     int b = BUILTIN_FREXP_MANT_F64(a.hi) < (2.0/3.0);
diff --git a/ocml/src/lnepF.cl b/ocml/src/lnepF.cl
index 65675582..0c4502f2 100644
--- a/ocml/src/lnepF.cl
+++ b/ocml/src/lnepF.cl
@@ -10,7 +10,7 @@
 #define FLOAT_SPECIALIZATION
 #include "ep.h"
 
-INLINEATTR CONSTATTR float
+CONSTATTR float
 MATH_PRIVATE(lnep)(float2 a)
 {
     int b = BUILTIN_FREXP_MANT_F32(a.hi) < (2.0f/3.0f);
diff --git a/ocml/src/log10H.cl b/ocml/src/log10H.cl
index 1fbf60ae..2a03ff02 100644
--- a/ocml/src/log10H.cl
+++ b/ocml/src/log10H.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(log10)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(log10)(half x)
 {
     return (half)(BUILTIN_LOG2_F32((float)x) * 0x1.344136p-2f);
diff --git a/ocml/src/log1pD.cl b/ocml/src/log1pD.cl
index c5f5252f..240b4626 100644
--- a/ocml/src/log1pD.cl
+++ b/ocml/src/log1pD.cl
@@ -12,7 +12,7 @@ extern CONSTATTR double MATH_PRIVATE(lnep)(double2 x);
 #define DOUBLE_SPECIALIZATION
 #include "ep.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(log1p)(double x)
 {
     double z = MATH_PRIVATE(lnep)(add(1.0, x));
diff --git a/ocml/src/log1pF.cl b/ocml/src/log1pF.cl
index b4584519..ce8a5a2b 100644
--- a/ocml/src/log1pF.cl
+++ b/ocml/src/log1pF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float MATH_PRIVATE(lnep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(log1p)(float x)
 {
     float z = MATH_PRIVATE(lnep)(add(1.0, x));
diff --git a/ocml/src/log1pH.cl b/ocml/src/log1pH.cl
index da274acf..51b5ff7c 100644
--- a/ocml/src/log1pH.cl
+++ b/ocml/src/log1pH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(log1p)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(log1p)(half x)
 {
     half ret;
diff --git a/ocml/src/log2H.cl b/ocml/src/log2H.cl
index 3d38a9f6..4a46e968 100644
--- a/ocml/src/log2H.cl
+++ b/ocml/src/log2H.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(log2)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(log2)(half x)
 {
     return BUILTIN_LOG2_F16(x);
diff --git a/ocml/src/logF_base.h b/ocml/src/logF_base.h
index cddad305..763623ab 100644
--- a/ocml/src/logF_base.h
+++ b/ocml/src/logF_base.h
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR CONSTATTR float
+CONSTATTR float
 #if defined COMPILING_LOG2
 MATH_MANGLE(log2)(float x)
 #elif defined COMPILING_LOG10
diff --git a/ocml/src/logH.cl b/ocml/src/logH.cl
index d62fecc4..08439ff5 100644
--- a/ocml/src/logH.cl
+++ b/ocml/src/logH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(log)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(log)(half x)
 {
     return (half)(BUILTIN_LOG2_F32((float)x) * 0x1.62e430p-1f);
diff --git a/ocml/src/logbD.cl b/ocml/src/logbD.cl
index cbc52224..2b859853 100644
--- a/ocml/src/logbD.cl
+++ b/ocml/src/logbD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(logb)(double x)
 {
     double ret = (double)(BUILTIN_FREXP_EXP_F64(x) - 1);
diff --git a/ocml/src/logbF.cl b/ocml/src/logbF.cl
index f7154d4f..0e6cb740 100644
--- a/ocml/src/logbF.cl
+++ b/ocml/src/logbF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(logb)(float x)
 {
     float ret = (float)(BUILTIN_FREXP_EXP_F32(x) - 1);
diff --git a/ocml/src/logbH.cl b/ocml/src/logbH.cl
index 656d07b0..49af766e 100644
--- a/ocml/src/logbH.cl
+++ b/ocml/src/logbH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR UGEN(logb)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(logb)(half x)
 {
     half ret = (half)(BUILTIN_FREXP_EXP_F16(x) - (short)1);
diff --git a/ocml/src/madD.cl b/ocml/src/madD.cl
index e5573141..293e3fce 100644
--- a/ocml/src/madD.cl
+++ b/ocml/src/madD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(mad)(double a, double b, double c)
 {
     return MATH_MAD(a, b, c);
diff --git a/ocml/src/madF.cl b/ocml/src/madF.cl
index b1f67ec4..06546b44 100644
--- a/ocml/src/madF.cl
+++ b/ocml/src/madF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(mad)(float a, float b, float c)
 {
     return MATH_MAD(a, b, c);
diff --git a/ocml/src/madH.cl b/ocml/src/madH.cl
index 707f99ac..4f3d393f 100644
--- a/ocml/src/madH.cl
+++ b/ocml/src/madH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(mad)(half2 a, half2 b, half2 c)
 {
     return MATH_MAD2(a, b, c);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(mad)(half a, half b, half c)
 {
     return MATH_MAD(a, b, c);
diff --git a/ocml/src/maxD.cl b/ocml/src/maxD.cl
index 49b3dccb..7c6664b0 100644
--- a/ocml/src/maxD.cl
+++ b/ocml/src/maxD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(max)(double x, double y)
 {
     return BUILTIN_CMAX_F64(x, y);
diff --git a/ocml/src/maxF.cl b/ocml/src/maxF.cl
index 6e3e17ba..4cd0bfa9 100644
--- a/ocml/src/maxF.cl
+++ b/ocml/src/maxF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(max)(float x, float y)
 {
     return BUILTIN_CMAX_F32(x, y);
diff --git a/ocml/src/maxH.cl b/ocml/src/maxH.cl
index 31cad270..01479c8a 100644
--- a/ocml/src/maxH.cl
+++ b/ocml/src/maxH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(max)(half2 x, half2 y)
 {
     return BUILTIN_CMAX_2F16(x, y);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(max)(half x, half y)
 {
     return BUILTIN_CMAX_F16(x, y);
diff --git a/ocml/src/maxmagD.cl b/ocml/src/maxmagD.cl
index 9f606da8..3db12aad 100644
--- a/ocml/src/maxmagD.cl
+++ b/ocml/src/maxmagD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(maxmag)(double x, double y)
 {
 #if 0
diff --git a/ocml/src/maxmagF.cl b/ocml/src/maxmagF.cl
index 4997bd06..941fbe4b 100644
--- a/ocml/src/maxmagF.cl
+++ b/ocml/src/maxmagF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(maxmag)(float x, float y)
 {
 #if 0
diff --git a/ocml/src/maxmagH.cl b/ocml/src/maxmagH.cl
index 74ab78aa..9453df4e 100644
--- a/ocml/src/maxmagH.cl
+++ b/ocml/src/maxmagH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(maxmag)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(maxmag)(half x, half y)
 {
     x = BUILTIN_CANONICALIZE_F16(x);
diff --git a/ocml/src/minD.cl b/ocml/src/minD.cl
index c2d0b120..151178c2 100644
--- a/ocml/src/minD.cl
+++ b/ocml/src/minD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(min)(double x, double y)
 {
     return BUILTIN_CMIN_F64(x, y);
diff --git a/ocml/src/minF.cl b/ocml/src/minF.cl
index 9c5e741b..eb38af70 100644
--- a/ocml/src/minF.cl
+++ b/ocml/src/minF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(min)(float x, float y)
 {
     return BUILTIN_CMIN_F32(x, y);
diff --git a/ocml/src/minH.cl b/ocml/src/minH.cl
index 2ed7fa68..2f2eb4d7 100644
--- a/ocml/src/minH.cl
+++ b/ocml/src/minH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(min)(half2 x, half2 y)
 {
     return BUILTIN_CMIN_2F16(x, y);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(min)(half x, half y)
 {
     return BUILTIN_CMIN_F16(x, y);
diff --git a/ocml/src/minmagD.cl b/ocml/src/minmagD.cl
index 80e7e3f4..cb3dbf3d 100644
--- a/ocml/src/minmagD.cl
+++ b/ocml/src/minmagD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(minmag)(double x, double y)
 {
 #if 0
diff --git a/ocml/src/minmagF.cl b/ocml/src/minmagF.cl
index 41fabef4..8994aac0 100644
--- a/ocml/src/minmagF.cl
+++ b/ocml/src/minmagF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(minmag)(float x, float y)
 {
 #if 0
diff --git a/ocml/src/minmagH.cl b/ocml/src/minmagH.cl
index 8b3fd016..e2659945 100644
--- a/ocml/src/minmagH.cl
+++ b/ocml/src/minmagH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(minmag)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(minmag)(half x, half y)
 {
     x = BUILTIN_CANONICALIZE_F16(x);
diff --git a/ocml/src/modfD.cl b/ocml/src/modfD.cl
index 317abdc6..6ad02e35 100644
--- a/ocml/src/modfD.cl
+++ b/ocml/src/modfD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(modf)(double x, __private double *iptr)
 {
     double tx = BUILTIN_TRUNC_F64(x);
diff --git a/ocml/src/modfF.cl b/ocml/src/modfF.cl
index 27b33289..7d9b2964 100644
--- a/ocml/src/modfF.cl
+++ b/ocml/src/modfF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(modf)(float x, __private float *iptr)
 {
     float tx = BUILTIN_TRUNC_F32(x);
diff --git a/ocml/src/modfH.cl b/ocml/src/modfH.cl
index 7c40cba9..8c28ef86 100644
--- a/ocml/src/modfH.cl
+++ b/ocml/src/modfH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(modf)(half2 x, __private half2 *iptr)
 {
     half2 tx = BUILTIN_TRUNC_2F16(x);
@@ -18,7 +18,7 @@ MATH_MANGLE2(modf)(half2 x, __private half2 *iptr)
     return BUILTIN_COPYSIGN_2F16(ret, x);
 }
 
-INLINEATTR half
+half
 MATH_MANGLE(modf)(half x, __private half *iptr)
 {
     half tx = BUILTIN_TRUNC_F16(x);
diff --git a/ocml/src/mulD.cl b/ocml/src/mulD.cl
index c567b07e..6d7e296f 100644
--- a/ocml/src/mulD.cl
+++ b/ocml/src/mulD.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double x, double y) \
 { \
     return BUILTIN_FULL_BINARY(fmul, false, ROUND, x, y); \
diff --git a/ocml/src/mulF.cl b/ocml/src/mulF.cl
index 0a26fa26..ace8b656 100644
--- a/ocml/src/mulF.cl
+++ b/ocml/src/mulF.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float x, float y) \
 { \
     float ret; \
diff --git a/ocml/src/mulH.cl b/ocml/src/mulH.cl
index 7fcf2141..2cb52876 100644
--- a/ocml/src/mulH.cl
+++ b/ocml/src/mulH.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half x, half y) \
 { \
     return BUILTIN_FULL_BINARY(fmulh, false, ROUND, x, y); \
diff --git a/ocml/src/nanD.cl b/ocml/src/nanD.cl
index 439c9654..762365bc 100644
--- a/ocml/src/nanD.cl
+++ b/ocml/src/nanD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(nan)(ulong nancode)
 {
     return AS_DOUBLE((nancode & MANTBITS_DP64) | QNANBITPATT_DP64);
diff --git a/ocml/src/nanF.cl b/ocml/src/nanF.cl
index 7fcf09fd..aeb5e530 100644
--- a/ocml/src/nanF.cl
+++ b/ocml/src/nanF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(nan)(uint nancode)
 {
     return AS_FLOAT(QNANBITPATT_SP32 | (nancode & 0xfffff));
diff --git a/ocml/src/nanH.cl b/ocml/src/nanH.cl
index 086c5f6d..b53e48e8 100644
--- a/ocml/src/nanH.cl
+++ b/ocml/src/nanH.cl
@@ -7,14 +7,14 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(nan)(ushort2 nancode)
 {
     ushort2 h = (ushort2)QNANBITPATT_HP16 | (nancode & (ushort2)0x01ff);
     return AS_HALF2(h);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(nan)(ushort nancode)
 {
     ushort h = (ushort)QNANBITPATT_HP16 | (nancode & (ushort)0x01ff);
diff --git a/ocml/src/ncdfH.cl b/ocml/src/ncdfH.cl
index 1ac2bf9f..cb7bd711 100644
--- a/ocml/src/ncdfH.cl
+++ b/ocml/src/ncdfH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(ncdf)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(ncdf)(half x)
 {
     return (half)MATH_UPMANGLE(ncdf)((float)x);
diff --git a/ocml/src/ncdfinvD.cl b/ocml/src/ncdfinvD.cl
index 300f6048..f2e6cfd5 100644
--- a/ocml/src/ncdfinvD.cl
+++ b/ocml/src/ncdfinvD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR PUREATTR double
+PUREATTR double
 MATH_MANGLE(ncdfinv)(double x)
 {
     return -0x1.6a09e667f3bcdp+0 * MATH_MANGLE(erfcinv)(x + x);
diff --git a/ocml/src/ncdfinvF.cl b/ocml/src/ncdfinvF.cl
index d04dddd0..9c31025d 100644
--- a/ocml/src/ncdfinvF.cl
+++ b/ocml/src/ncdfinvF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-INLINEATTR PUREATTR float
+PUREATTR float
 MATH_MANGLE(ncdfinv)(float x)
 {
     return -0x1.6a09e6p+0f * MATH_MANGLE(erfcinv)(x + x);
diff --git a/ocml/src/ncdfinvH.cl b/ocml/src/ncdfinvH.cl
index 3905a68d..8f4fceca 100644
--- a/ocml/src/ncdfinvH.cl
+++ b/ocml/src/ncdfinvH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(ncdfinv)
 
-INLINEATTR PUREATTR half
+PUREATTR half
 MATH_MANGLE(ncdfinv)(half x)
 {
     return (half)MATH_UPMANGLE(ncdfinv)((float)x);
diff --git a/ocml/src/nearbyintD.cl b/ocml/src/nearbyintD.cl
index df2d005b..a222532f 100644
--- a/ocml/src/nearbyintD.cl
+++ b/ocml/src/nearbyintD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(nearbyint)(double x)
 {
     return BUILTIN_RINT_F64(x);
diff --git a/ocml/src/nearbyintF.cl b/ocml/src/nearbyintF.cl
index 5ae97fff..44be2481 100644
--- a/ocml/src/nearbyintF.cl
+++ b/ocml/src/nearbyintF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(nearbyint)(float x)
 {
     return BUILTIN_RINT_F32(x);
diff --git a/ocml/src/nearbyintH.cl b/ocml/src/nearbyintH.cl
index cf2e962c..92c0fa3b 100644
--- a/ocml/src/nearbyintH.cl
+++ b/ocml/src/nearbyintH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(nearbyint)(half2 x)
 {
     return BUILTIN_RINT_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(nearbyint)(half x)
 {
     return BUILTIN_RINT_F16(x);
diff --git a/ocml/src/nextafterD.cl b/ocml/src/nextafterD.cl
index ee4031c6..aa1add9f 100644
--- a/ocml/src/nextafterD.cl
+++ b/ocml/src/nextafterD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(nextafter)(double x, double y)
 {
     long ix = AS_LONG(x);
diff --git a/ocml/src/nextafterF.cl b/ocml/src/nextafterF.cl
index 4ef25bcd..0c4180c5 100644
--- a/ocml/src/nextafterF.cl
+++ b/ocml/src/nextafterF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(nextafter)(float x, float y)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/nextafterH.cl b/ocml/src/nextafterH.cl
index d81028ac..517ce81a 100644
--- a/ocml/src/nextafterH.cl
+++ b/ocml/src/nextafterH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(nextafter)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(nextafter)(half x, half y)
 {
     short ix = AS_SHORT(x);
diff --git a/ocml/src/pownH.cl b/ocml/src/pownH.cl
index c8c74d31..3604cae6 100644
--- a/ocml/src/pownH.cl
+++ b/ocml/src/pownH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-PUREATTR INLINEATTR half2
+PUREATTR half2
 MATH_MANGLE2(pown)(half2 x, int2 ny)
 {
     return (half2)(MATH_MANGLE(pown)(x.lo, ny.lo), MATH_MANGLE(pown)(x.hi, ny.hi));
diff --git a/ocml/src/rcbrtF.cl b/ocml/src/rcbrtF.cl
index 1fd6c9c0..0e393e68 100644
--- a/ocml/src/rcbrtF.cl
+++ b/ocml/src/rcbrtF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(rcbrt)(float x)
 {
     if (DAZ_OPT()) {
diff --git a/ocml/src/remainderF_base.h b/ocml/src/remainderF_base.h
index 4422f826..a79ec5d1 100644
--- a/ocml/src/remainderF_base.h
+++ b/ocml/src/remainderF_base.h
@@ -18,7 +18,7 @@
         CLO = MATH_MAD(__ta, __tb, MATH_MAD(__ta, __hb, MATH_MAD(__ha, __tb, MATH_MAD(__ha, __hb, -CHI)))); \
     } while (0)
 
-CONSTATTR static inline float
+CONSTATTR INLINEATTR static float
 fnma(float a, float b, float c)
 {
     float d;
diff --git a/ocml/src/remquoH.cl b/ocml/src/remquoH.cl
index 3893dded..18106093 100644
--- a/ocml/src/remquoH.cl
+++ b/ocml/src/remquoH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(remquo)(half2 x, half2 y, __private int2 *q7p)
 {
     int qlo, qhi;
diff --git a/ocml/src/rhypotD.cl b/ocml/src/rhypotD.cl
index 0524902b..4339b4f5 100644
--- a/ocml/src/rhypotD.cl
+++ b/ocml/src/rhypotD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(rhypot)(double x, double y)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/rhypotF.cl b/ocml/src/rhypotF.cl
index 56cc0d2f..cdf08f86 100644
--- a/ocml/src/rhypotF.cl
+++ b/ocml/src/rhypotF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(rhypot)(float x, float y)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/rhypotH.cl b/ocml/src/rhypotH.cl
index d1c571a0..97acf627 100644
--- a/ocml/src/rhypotH.cl
+++ b/ocml/src/rhypotH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(rhypot)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(rhypot)(half x, half y)
 {
     float fx = (float)x;
diff --git a/ocml/src/rintD.cl b/ocml/src/rintD.cl
index a43b5ec8..7c3bb107 100644
--- a/ocml/src/rintD.cl
+++ b/ocml/src/rintD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(rint)(double x)
 {
     return BUILTIN_RINT_F64(x);
diff --git a/ocml/src/rintF.cl b/ocml/src/rintF.cl
index a95c223b..17254933 100644
--- a/ocml/src/rintF.cl
+++ b/ocml/src/rintF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(rint)(float x)
 {
     return BUILTIN_RINT_F32(x);
diff --git a/ocml/src/rintH.cl b/ocml/src/rintH.cl
index fa789d5b..f2ffd3c1 100644
--- a/ocml/src/rintH.cl
+++ b/ocml/src/rintH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(rint)(half2 x)
 {
     return BUILTIN_RINT_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(rint)(half x)
 {
     return BUILTIN_RINT_F16(x);
diff --git a/ocml/src/rlen3D.cl b/ocml/src/rlen3D.cl
index f9442e48..a1081a2c 100644
--- a/ocml/src/rlen3D.cl
+++ b/ocml/src/rlen3D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(rlen3)(double x, double y, double z)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/rlen3F.cl b/ocml/src/rlen3F.cl
index bf0cab90..03f2c40a 100644
--- a/ocml/src/rlen3F.cl
+++ b/ocml/src/rlen3F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(rlen3)(float x, float y, float z)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/rlen3H.cl b/ocml/src/rlen3H.cl
index c12755f7..b147b44d 100644
--- a/ocml/src/rlen3H.cl
+++ b/ocml/src/rlen3H.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(rlen3)(half x, half y, half z)
 {
     float fx = (float)x;
diff --git a/ocml/src/rlen4D.cl b/ocml/src/rlen4D.cl
index 9c4fe9bf..4d16f943 100644
--- a/ocml/src/rlen4D.cl
+++ b/ocml/src/rlen4D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(rlen4)(double x, double y, double z, double w)
 {
     double a = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/rlen4F.cl b/ocml/src/rlen4F.cl
index 733f62d1..e6d7603f 100644
--- a/ocml/src/rlen4F.cl
+++ b/ocml/src/rlen4F.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(rlen4)(float x, float y, float z, float w)
 {
     float a = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/rlen4H.cl b/ocml/src/rlen4H.cl
index 9fb13359..5abb05f5 100644
--- a/ocml/src/rlen4H.cl
+++ b/ocml/src/rlen4H.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(rlen4)(half x, half y, half z, half w)
 {
     float fx = (float)x;
diff --git a/ocml/src/rootnH.cl b/ocml/src/rootnH.cl
index d17abfc8..5bd94272 100644
--- a/ocml/src/rootnH.cl
+++ b/ocml/src/rootnH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-PUREATTR INLINEATTR half2
+PUREATTR half2
 MATH_MANGLE2(rootn)(half2 x, int2 ny)
 {
     return (half2)(MATH_MANGLE(rootn)(x.lo, ny.lo), MATH_MANGLE(rootn)(x.hi, ny.hi));
diff --git a/ocml/src/roundD.cl b/ocml/src/roundD.cl
index e8281f8d..0bc2aedb 100644
--- a/ocml/src/roundD.cl
+++ b/ocml/src/roundD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(round)(double x)
 {
     double t = BUILTIN_TRUNC_F64(x);
diff --git a/ocml/src/roundF.cl b/ocml/src/roundF.cl
index bbaf3e6d..2b98a223 100644
--- a/ocml/src/roundF.cl
+++ b/ocml/src/roundF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(round)(float x)
 {
     float t = BUILTIN_TRUNC_F32(x);
diff --git a/ocml/src/roundH.cl b/ocml/src/roundH.cl
index 045f5d95..d735a7fb 100644
--- a/ocml/src/roundH.cl
+++ b/ocml/src/roundH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(round)(half2 x)
 {
     half2 t = BUILTIN_TRUNC_2F16(x);
@@ -18,7 +18,7 @@ MATH_MANGLE2(round)(half2 x)
     return t + o;
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(round)(half x)
 {
     half t = BUILTIN_TRUNC_F16(x);
diff --git a/ocml/src/rsqrtD.cl b/ocml/src/rsqrtD.cl
index d67127d4..5fd5d156 100644
--- a/ocml/src/rsqrtD.cl
+++ b/ocml/src/rsqrtD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(rsqrt)(double x)
 {
     double y0 = BUILTIN_RSQRT_F64(x);
diff --git a/ocml/src/rsqrtF.cl b/ocml/src/rsqrtF.cl
index dc7df5fb..8349387f 100644
--- a/ocml/src/rsqrtF.cl
+++ b/ocml/src/rsqrtF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-PUREATTR INLINEATTR float
+PUREATTR float
 MATH_MANGLE(rsqrt)(float x)
 {
     if (DAZ_OPT()) {
diff --git a/ocml/src/rsqrtH.cl b/ocml/src/rsqrtH.cl
index ec5f9bed..ab42880e 100644
--- a/ocml/src/rsqrtH.cl
+++ b/ocml/src/rsqrtH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR UGEN(rsqrt)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(rsqrt)(half x)
 {
     return BUILTIN_RSQRT_F16(x);
diff --git a/ocml/src/scalbD.cl b/ocml/src/scalbD.cl
index 5bfce8a7..cfe4caf3 100644
--- a/ocml/src/scalbD.cl
+++ b/ocml/src/scalbD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(scalb)(double x, double y)
 {
     double t = BUILTIN_MIN_F64(BUILTIN_MAX_F64(y, -0x1.0p+20), 0x1.0p+20);
diff --git a/ocml/src/scalbF.cl b/ocml/src/scalbF.cl
index f957fb7b..05d95969 100644
--- a/ocml/src/scalbF.cl
+++ b/ocml/src/scalbF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(scalb)(float x, float y)
 {
     float t = BUILTIN_CLAMP_F32(y, -0x1.0p+20f, 0x1.0p+20f);
diff --git a/ocml/src/scalbH.cl b/ocml/src/scalbH.cl
index 2d55c644..53b8cc8e 100644
--- a/ocml/src/scalbH.cl
+++ b/ocml/src/scalbH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR BGEN(scalb)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(scalb)(half x, half y)
 {
     half t = BUILTIN_MIN_F16(BUILTIN_MAX_F16(y, -0x1.0p+6h), 0x1.0p+6h);
diff --git a/ocml/src/scalbnD.cl b/ocml/src/scalbnD.cl
index 350c47f9..07ecd541 100644
--- a/ocml/src/scalbnD.cl
+++ b/ocml/src/scalbnD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(scalbn)(double x, int n)
 {
     return MATH_MANGLE(ldexp)(x, n);
diff --git a/ocml/src/scalbnF.cl b/ocml/src/scalbnF.cl
index 49f4e700..b0adcc1a 100644
--- a/ocml/src/scalbnF.cl
+++ b/ocml/src/scalbnF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(scalbn)(float x, int n)
 {
     return MATH_MANGLE(ldexp)(x, n);
diff --git a/ocml/src/scalbnH.cl b/ocml/src/scalbnH.cl
index 5656013c..f9be702e 100644
--- a/ocml/src/scalbnH.cl
+++ b/ocml/src/scalbnH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(scalbn)(half2 x, int2 n)
 {
     return (half2)(MATH_MANGLE(ldexp)(x.lo, n.lo), MATH_MANGLE(ldexp)(x.hi, n.hi));
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(scalbn)(half x, int n)
 {
     return MATH_MANGLE(ldexp)(x, n);
diff --git a/ocml/src/signbitD.cl b/ocml/src/signbitD.cl
index 3c93ca5b..98681e5d 100644
--- a/ocml/src/signbitD.cl
+++ b/ocml/src/signbitD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(signbit)(double x)
 {
     return AS_INT2(x).hi < 0;
diff --git a/ocml/src/signbitF.cl b/ocml/src/signbitF.cl
index 3ceec89c..e944a72b 100644
--- a/ocml/src/signbitF.cl
+++ b/ocml/src/signbitF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(signbit)(float x)
 {
     return AS_INT(x) < 0;
diff --git a/ocml/src/signbitH.cl b/ocml/src/signbitH.cl
index e5fb9130..b5d99170 100644
--- a/ocml/src/signbitH.cl
+++ b/ocml/src/signbitH.cl
@@ -7,7 +7,7 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR short2
+CONSTATTR short2
 MATH_MANGLE2(signbit)(half2 x)
 {
     return (short2)
@@ -15,7 +15,7 @@ MATH_MANGLE2(signbit)(half2 x)
          AS_SHORT(x.hi) < 0 ? (short)-1 : (short)0);
 }
 
-CONSTATTR INLINEATTR int
+CONSTATTR int
 MATH_MANGLE(signbit)(half x)
 {
     return AS_SHORT(x) < 0;
diff --git a/ocml/src/sinD.cl b/ocml/src/sinD.cl
index c44c1101..8f4464c2 100644
--- a/ocml/src/sinD.cl
+++ b/ocml/src/sinD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(sin)(double x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/sinF.cl b/ocml/src/sinF.cl
index c42c05e4..c9059771 100644
--- a/ocml/src/sinF.cl
+++ b/ocml/src/sinF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(sin)(float x)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/sinH.cl b/ocml/src/sinH.cl
index 7cd9aae7..7c018cc3 100644
--- a/ocml/src/sinH.cl
+++ b/ocml/src/sinH.cl
@@ -10,7 +10,7 @@
 
 UGEN(sin)
 
-INLINEATTR half
+half
 MATH_MANGLE(sin)(half x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/sinbD.cl b/ocml/src/sinbD.cl
index c8db0800..c98a8fa2 100644
--- a/ocml/src/sinbD.cl
+++ b/ocml/src/sinbD.cl
@@ -24,7 +24,7 @@
         L = __e; \
     } while (0)
 
-INLINEATTR double
+double
 MATH_PRIVATE(sinb)(double x, int n, double p)
 {
     struct redret r = MATH_PRIVATE(trigred)(x);
diff --git a/ocml/src/sinbF.cl b/ocml/src/sinbF.cl
index 0bd14e13..cdc139be 100644
--- a/ocml/src/sinbF.cl
+++ b/ocml/src/sinbF.cl
@@ -24,7 +24,7 @@
         L = __e; \
     } while (0)
 
-INLINEATTR float
+float
 MATH_PRIVATE(sinb)(float x, int n, float p)
 {
     struct redret r = MATH_PRIVATE(trigred)(x);
diff --git a/ocml/src/sincosD.cl b/ocml/src/sincosD.cl
index ba74767d..891d083d 100644
--- a/ocml/src/sincosD.cl
+++ b/ocml/src/sincosD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(sincos)(double x, __private double * cp)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/sincosF.cl b/ocml/src/sincosF.cl
index a1286cc5..123b4595 100644
--- a/ocml/src/sincosF.cl
+++ b/ocml/src/sincosF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(sincos)(float x, __private float *cp)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/sincosH.cl b/ocml/src/sincosH.cl
index 8c314f12..bdf62827 100644
--- a/ocml/src/sincosH.cl
+++ b/ocml/src/sincosH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigredH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(sincos)(half2 x, __private half2 *cp)
 {
     half2 s;
@@ -19,7 +19,7 @@ MATH_MANGLE2(sincos)(half2 x, __private half2 *cp)
     return s;
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(sincos)(half x, __private half *cp)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/sincospiD.cl b/ocml/src/sincospiD.cl
index 41e1438d..4ede0cc7 100644
--- a/ocml/src/sincospiD.cl
+++ b/ocml/src/sincospiD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(sincospi)(double x, __private double * cp)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/sincospiF.cl b/ocml/src/sincospiF.cl
index 91b61dc4..9585bb42 100644
--- a/ocml/src/sincospiF.cl
+++ b/ocml/src/sincospiF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(sincospi)(float x, __private float *cp)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/sincospiH.cl b/ocml/src/sincospiH.cl
index 495bac5c..78249533 100644
--- a/ocml/src/sincospiH.cl
+++ b/ocml/src/sincospiH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigpiredH.h"
 
-INLINEATTR half2
+half2
 MATH_MANGLE2(sincospi)(half2 x, __private half2 *cp)
 {
     half2 s;
@@ -20,7 +20,7 @@ MATH_MANGLE2(sincospi)(half2 x, __private half2 *cp)
     return s;
 }
 
-INLINEATTR half
+half
 MATH_MANGLE(sincospi)(half x, __private half *cp)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/sincospiredD.cl b/ocml/src/sincospiredD.cl
index 4e750f8f..aae84504 100644
--- a/ocml/src/sincospiredD.cl
+++ b/ocml/src/sincospiredD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincospired)(double x)
 {
     double t = x * x;
diff --git a/ocml/src/sincospiredF.cl b/ocml/src/sincospiredF.cl
index 1a528847..ac164a17 100644
--- a/ocml/src/sincospiredF.cl
+++ b/ocml/src/sincospiredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincospired)(float x)
 {
 
diff --git a/ocml/src/sincospiredH.cl b/ocml/src/sincospiredH.cl
index a7aa0f3f..33a13ab0 100644
--- a/ocml/src/sincospiredH.cl
+++ b/ocml/src/sincospiredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigpiredH.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincospired)(half x)
 {
     half t = x * x;
diff --git a/ocml/src/sincosred2D.cl b/ocml/src/sincosred2D.cl
index e63b71a3..3d8c487d 100644
--- a/ocml/src/sincosred2D.cl
+++ b/ocml/src/sincosred2D.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincosred2)(double x, double y)
 {
     const double S0 = -0x1.5555555555555p-3;
diff --git a/ocml/src/sincosred2F.cl b/ocml/src/sincosred2F.cl
index 96eb3c18..16cd8fde 100644
--- a/ocml/src/sincosred2F.cl
+++ b/ocml/src/sincosred2F.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincosred2)(float x, float y)
 {
     const float c0 =  0x1.555556p-5f;
diff --git a/ocml/src/sincosredD.cl b/ocml/src/sincosredD.cl
index 3d549195..4418d623 100644
--- a/ocml/src/sincosredD.cl
+++ b/ocml/src/sincosredD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincosred)(double x)
 {
     const double S0 = -0x1.5555555555555p-3;
diff --git a/ocml/src/sincosredF.cl b/ocml/src/sincosredF.cl
index 8e21dfad..54167c47 100644
--- a/ocml/src/sincosredF.cl
+++ b/ocml/src/sincosredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincosred)(float x)
 {
     float t = x * x;
diff --git a/ocml/src/sincosredH.cl b/ocml/src/sincosredH.cl
index 202732d9..0dd4b17d 100644
--- a/ocml/src/sincosredH.cl
+++ b/ocml/src/sincosredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigredH.h"
 
-CONSTATTR INLINEATTR struct scret
+CONSTATTR struct scret
 MATH_PRIVATE(sincosred)(half x)
 {
     half t = x * x;
diff --git a/ocml/src/sinhD.cl b/ocml/src/sinhD.cl
index 7d377385..0bab018b 100644
--- a/ocml/src/sinhD.cl
+++ b/ocml/src/sinhD.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR double2 MATH_PRIVATE(epexpep)(double2 x);
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(sinh)(double x)
 {
     double y = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/sinhF.cl b/ocml/src/sinhF.cl
index 5718e06e..9ea55fc9 100644
--- a/ocml/src/sinhF.cl
+++ b/ocml/src/sinhF.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR float2 MATH_PRIVATE(epexpep)(float2 x);
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(sinh)(float x)
 {
     float y = BUILTIN_ABS_F32(x);
diff --git a/ocml/src/sinhH.cl b/ocml/src/sinhH.cl
index 92954661..c3ab5ed7 100644
--- a/ocml/src/sinhH.cl
+++ b/ocml/src/sinhH.cl
@@ -9,7 +9,7 @@
 
 PUREATTR UGEN(sinh)
 
-PUREATTR INLINEATTR half
+PUREATTR half
 MATH_MANGLE(sinh)(half hx)
 {
     float x = (float)hx * 0x1.715476p+0f;
diff --git a/ocml/src/sinpiD.cl b/ocml/src/sinpiD.cl
index 84039c97..ab208901 100644
--- a/ocml/src/sinpiD.cl
+++ b/ocml/src/sinpiD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-INLINEATTR double
+double
 MATH_MANGLE(sinpi)(double x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/sinpiF.cl b/ocml/src/sinpiF.cl
index 07f1e97d..2a50553a 100644
--- a/ocml/src/sinpiF.cl
+++ b/ocml/src/sinpiF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(sinpi)(float x)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/sinpiH.cl b/ocml/src/sinpiH.cl
index 2848978c..c738c222 100644
--- a/ocml/src/sinpiH.cl
+++ b/ocml/src/sinpiH.cl
@@ -10,7 +10,7 @@
 
 UGEN(sinpi)
 
-INLINEATTR half
+half
 MATH_MANGLE(sinpi)(half x)
 {
     struct redret r =  MATH_PRIVATE(trigpired)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/sqrtD.cl b/ocml/src/sqrtD.cl
index a68f7bd0..e2a6fedf 100644
--- a/ocml/src/sqrtD.cl
+++ b/ocml/src/sqrtD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(sqrt)(double x)
 {
     return MATH_SQRT(x);
@@ -17,7 +17,7 @@ MATH_MANGLE(sqrt)(double x)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double x) \
 { \
     return BUILTIN_FULL_UNARY(fsqrt, false, ROUND, x); \
diff --git a/ocml/src/sqrtF.cl b/ocml/src/sqrtF.cl
index dbf495c5..99b32c25 100644
--- a/ocml/src/sqrtF.cl
+++ b/ocml/src/sqrtF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(sqrt)(float x)
 {
     if (CORRECTLY_ROUNDED_SQRT32()) {
@@ -21,7 +21,7 @@ MATH_MANGLE(sqrt)(float x)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float x) \
 { \
     float ret; \
diff --git a/ocml/src/sqrtH.cl b/ocml/src/sqrtH.cl
index 3c663887..321003f9 100644
--- a/ocml/src/sqrtH.cl
+++ b/ocml/src/sqrtH.cl
@@ -9,7 +9,7 @@
 
 CONSTATTR UGEN(sqrt)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(sqrt)(half x)
 {
     return BUILTIN_SQRT_F16(x);
@@ -19,7 +19,7 @@ MATH_MANGLE(sqrt)(half x)
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half x) \
 { \
     return BUILTIN_FULL_UNARY(fsqrth, false, ROUND, x); \
diff --git a/ocml/src/subD.cl b/ocml/src/subD.cl
index beda1a10..a9f4d3f1 100644
--- a/ocml/src/subD.cl
+++ b/ocml/src/subD.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR double \
+CONSTATTR double \
 MATH_MANGLE(NAME)(double x, double y) \
 { \
     return BUILTIN_FULL_BINARY(fsub, false, ROUND, x, y); \
diff --git a/ocml/src/subF.cl b/ocml/src/subF.cl
index 30664d6c..a8a4f2dd 100644
--- a/ocml/src/subF.cl
+++ b/ocml/src/subF.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR float \
+CONSTATTR float \
 MATH_MANGLE(NAME)(float x, float y) \
 { \
     float ret; \
diff --git a/ocml/src/subH.cl b/ocml/src/subH.cl
index 6ca8e24b..054c46d2 100644
--- a/ocml/src/subH.cl
+++ b/ocml/src/subH.cl
@@ -11,7 +11,7 @@
 #if defined HSAIL_BUILD
 
 #define GEN(NAME,ROUND)\
-CONSTATTR INLINEATTR half \
+CONSTATTR half \
 MATH_MANGLE(NAME)(half x, half y) \
 { \
     return BUILTIN_FULL_BINARY(fsubh, false, ROUND, x, y); \
diff --git a/ocml/src/tanD.cl b/ocml/src/tanD.cl
index e004e1be..0a3193d3 100644
--- a/ocml/src/tanD.cl
+++ b/ocml/src/tanD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(tan)(double x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/tanF.cl b/ocml/src/tanF.cl
index 8bd8a7c5..efe22a75 100644
--- a/ocml/src/tanF.cl
+++ b/ocml/src/tanF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-INLINEATTR float
+float
 MATH_MANGLE(tan)(float x)
 {
     int ix = AS_INT(x);
diff --git a/ocml/src/tanH.cl b/ocml/src/tanH.cl
index 87fbceb6..36d91d3c 100644
--- a/ocml/src/tanH.cl
+++ b/ocml/src/tanH.cl
@@ -10,7 +10,7 @@
 
 UGEN(tan)
 
-INLINEATTR half
+half
 MATH_MANGLE(tan)(half x)
 {
     struct redret r = MATH_PRIVATE(trigred)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/tanhD.cl b/ocml/src/tanhD.cl
index 834e397e..e0c896d9 100644
--- a/ocml/src/tanhD.cl
+++ b/ocml/src/tanhD.cl
@@ -12,7 +12,7 @@
 
 extern CONSTATTR double2 MATH_PRIVATE(epexpep)(double2 x);
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(tanh)(double x)
 {
     double y = BUILTIN_ABS_F64(x);
diff --git a/ocml/src/tanpiD.cl b/ocml/src/tanpiD.cl
index d6e5a27a..90c746ef 100644
--- a/ocml/src/tanpiD.cl
+++ b/ocml/src/tanpiD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(tanpi)(double x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F64(x));
diff --git a/ocml/src/tanpiF.cl b/ocml/src/tanpiF.cl
index 9c951e55..a13b9143 100644
--- a/ocml/src/tanpiF.cl
+++ b/ocml/src/tanpiF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(tanpi)(float x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F32(x));
diff --git a/ocml/src/tanpiH.cl b/ocml/src/tanpiH.cl
index 25a6fa90..b0571ba5 100644
--- a/ocml/src/tanpiH.cl
+++ b/ocml/src/tanpiH.cl
@@ -10,7 +10,7 @@
 
 CONSTATTR UGEN(tanpi)
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(tanpi)(half x)
 {
     struct redret r = MATH_PRIVATE(trigpired)(BUILTIN_ABS_F16(x));
diff --git a/ocml/src/tanpiredD.cl b/ocml/src/tanpiredD.cl
index 5d877733..ecedafd2 100644
--- a/ocml/src/tanpiredD.cl
+++ b/ocml/src/tanpiredD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_PRIVATE(tanpired)(double x, int i)
 {
     double s = x * x;
diff --git a/ocml/src/tanpiredF.cl b/ocml/src/tanpiredF.cl
index 25b2467b..96e63ad2 100644
--- a/ocml/src/tanpiredF.cl
+++ b/ocml/src/tanpiredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(tanpired)(float x, int i)
 {
     float s = x * x;
diff --git a/ocml/src/tanpiredH.cl b/ocml/src/tanpiredH.cl
index 221797f7..645f58a5 100644
--- a/ocml/src/tanpiredH.cl
+++ b/ocml/src/tanpiredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigpiredH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_PRIVATE(tanpired)(half x, short i)
 {
     half s = x * x;
diff --git a/ocml/src/tanred2D.cl b/ocml/src/tanred2D.cl
index ae5d49c6..18dd4bf8 100644
--- a/ocml/src/tanred2D.cl
+++ b/ocml/src/tanred2D.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-INLINEATTR CONSTATTR double
+CONSTATTR double
 MATH_PRIVATE(tanred2)(double x, double xx, int sel)
 {
     const double piby4_lead = 0x1.921fb54442d18p-1;
diff --git a/ocml/src/tanredF.cl b/ocml/src/tanredF.cl
index 0bb6744c..b1a196cc 100644
--- a/ocml/src/tanredF.cl
+++ b/ocml/src/tanredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_PRIVATE(tanred)(float x, int i)
 {
     float s = x * x;
diff --git a/ocml/src/tanredH.cl b/ocml/src/tanredH.cl
index bade03c2..b11844f2 100644
--- a/ocml/src/tanredH.cl
+++ b/ocml/src/tanredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigredH.h"
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_PRIVATE(tanred)(half x, short i)
 {
     half s = x * x;
diff --git a/ocml/src/tgammaH.cl b/ocml/src/tgammaH.cl
index 07a72ef2..8ae01c2c 100644
--- a/ocml/src/tgammaH.cl
+++ b/ocml/src/tgammaH.cl
@@ -9,7 +9,7 @@
 
 UGEN(tgamma)
 
-INLINEATTR half
+half
 MATH_MANGLE(tgamma)(half x)
 {
     return (half)MATH_UPMANGLE(tgamma)((float)x);
diff --git a/ocml/src/trigpiredD.cl b/ocml/src/trigpiredD.cl
index 8411e57d..7bea3077 100644
--- a/ocml/src/trigpiredD.cl
+++ b/ocml/src/trigpiredD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigpiredD.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigpired)(double x)
 {
     double t = 2.0 * BUILTIN_FRACTION_F64(0.5 * x);
diff --git a/ocml/src/trigpiredF.cl b/ocml/src/trigpiredF.cl
index 2f93312b..bcdc5727 100644
--- a/ocml/src/trigpiredF.cl
+++ b/ocml/src/trigpiredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigpiredF.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigpired)(float x)
 {
     float t = 2.0f * BUILTIN_FRACTION_F32(0.5f * x);
diff --git a/ocml/src/trigpiredH.cl b/ocml/src/trigpiredH.cl
index 7023567d..7615528f 100644
--- a/ocml/src/trigpiredH.cl
+++ b/ocml/src/trigpiredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigpiredH.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigpired)(half x)
 {
     half t = 2.0h * BUILTIN_FRACTION_F16(0.5h * x);
diff --git a/ocml/src/trigredD.cl b/ocml/src/trigredD.cl
index 76c78d4a..c9700fd8 100644
--- a/ocml/src/trigredD.cl
+++ b/ocml/src/trigredD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigred)(double x)
 {
     if (x < 0x1.0p+21)
diff --git a/ocml/src/trigredF.cl b/ocml/src/trigredF.cl
index 240eee20..20cbd39b 100644
--- a/ocml/src/trigredF.cl
+++ b/ocml/src/trigredF.cl
@@ -8,7 +8,7 @@
 #include "mathF.h"
 #include "trigredF.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigred)(float x)
 {
     if (x < SMALL_BOUND)
diff --git a/ocml/src/trigredH.cl b/ocml/src/trigredH.cl
index b69d38f9..ac75d51a 100644
--- a/ocml/src/trigredH.cl
+++ b/ocml/src/trigredH.cl
@@ -8,7 +8,7 @@
 #include "mathH.h"
 #include "trigredH.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigred)(half hx)
 {
     const float twobypi = 0x1.45f306p-1f;
diff --git a/ocml/src/trigredsmallD.cl b/ocml/src/trigredsmallD.cl
index fafe0fd8..0cac73ef 100644
--- a/ocml/src/trigredsmallD.cl
+++ b/ocml/src/trigredsmallD.cl
@@ -8,7 +8,7 @@
 #include "mathD.h"
 #include "trigredD.h"
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigredsmall)(double x)
 {
     const double twobypi = 0x1.45f306dc9c883p-1;
diff --git a/ocml/src/trigredsmallF.cl b/ocml/src/trigredsmallF.cl
index c56841b3..c93a2761 100644
--- a/ocml/src/trigredsmallF.cl
+++ b/ocml/src/trigredsmallF.cl
@@ -91,7 +91,7 @@ fma_reduce(float x)
     return ret;
 }
 
-CONSTATTR INLINEATTR struct redret
+CONSTATTR struct redret
 MATH_PRIVATE(trigredsmall)(float x)
 {
     if (HAVE_FAST_FMA32()) {
diff --git a/ocml/src/truncD.cl b/ocml/src/truncD.cl
index 91810829..b1ae0417 100644
--- a/ocml/src/truncD.cl
+++ b/ocml/src/truncD.cl
@@ -7,7 +7,7 @@
 
 #include "mathD.h"
 
-CONSTATTR INLINEATTR double
+CONSTATTR double
 MATH_MANGLE(trunc)(double x)
 {
     return BUILTIN_TRUNC_F64(x);
diff --git a/ocml/src/truncF.cl b/ocml/src/truncF.cl
index 88ee87da..3d279363 100644
--- a/ocml/src/truncF.cl
+++ b/ocml/src/truncF.cl
@@ -7,7 +7,7 @@
 
 #include "mathF.h"
 
-CONSTATTR INLINEATTR float
+CONSTATTR float
 MATH_MANGLE(trunc)(float x)
 {
     return BUILTIN_TRUNC_F32(x);
diff --git a/ocml/src/truncH.cl b/ocml/src/truncH.cl
index 77292247..6787af80 100644
--- a/ocml/src/truncH.cl
+++ b/ocml/src/truncH.cl
@@ -7,13 +7,13 @@
 
 #include "mathH.h"
 
-CONSTATTR INLINEATTR half2
+CONSTATTR half2
 MATH_MANGLE2(trunc)(half2 x)
 {
     return BUILTIN_TRUNC_2F16(x);
 }
 
-CONSTATTR INLINEATTR half
+CONSTATTR half
 MATH_MANGLE(trunc)(half x)
 {
     return BUILTIN_TRUNC_F16(x);
diff --git a/ocml/src/y0H.cl b/ocml/src/y0H.cl
index b2a81454..c187f45a 100644
--- a/ocml/src/y0H.cl
+++ b/ocml/src/y0H.cl
@@ -9,7 +9,7 @@
 
 UGEN(y0)
 
-INLINEATTR half
+half
 MATH_MANGLE(y0)(half x)
 {
     return (half)MATH_UPMANGLE(y0)((float)x);
diff --git a/ocml/src/y1H.cl b/ocml/src/y1H.cl
index 0c4197f0..a09ad9ef 100644
--- a/ocml/src/y1H.cl
+++ b/ocml/src/y1H.cl
@@ -9,7 +9,7 @@
 
 UGEN(y1)
 
-INLINEATTR half
+half
 MATH_MANGLE(y1)(half x)
 {
     return (half)MATH_UPMANGLE(y1)((float)x);