This has been "deprecated" since 2011, but because it is still
referenced from XORG_DEFAULT_OPTIONS nothing has ever been updated to
get strict aliasing right. Let's fix that.

Signed-off-by: Adam Jackson <[email protected]>
---
 xorg-macros.m4.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index efce888..2c34cab 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1750,20 +1750,19 @@ AC_SUBST([BASE_]PREFIX[FLAGS])
 #
 # Defines CWARNFLAGS to enable C compiler warnings.
 #
-# This function is deprecated because it defines -fno-strict-aliasing
+# This function was deprecated because it defined -fno-strict-aliasing
 # which alters the code generated by the compiler.  If -fno-strict-aliasing
 # is needed, then it should be added explicitly in the module when
 # it is updated to use BASE_CFLAGS.
 #
+# It now no longer adds the flag, but is still referenced in order to keep
+# CWARNFLAGS working as before.
 AC_DEFUN([XORG_CWARNFLAGS], [
 AC_REQUIRE([XORG_COMPILER_FLAGS])
 AC_REQUIRE([XORG_COMPILER_BRAND])
 AC_LANG_CASE(
        [C], [
                CWARNFLAGS="$BASE_CFLAGS"
-               if  test "x$GCC" = xyes ; then
-                   CWARNFLAGS="$CWARNFLAGS -fno-strict-aliasing"
-               fi
                AC_SUBST(CWARNFLAGS)
        ]
 )
-- 
2.14.3

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to