components/gcc48/patches/006-fixincludes-check.tpl.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 07 Dec 2015 16:17:05 -0800
changeset 5166 29635ee48caa
parent 1561 3b427cd1199e
permissions -rw-r--r--
17458457 Several ncurses man pages are delivered in the wrong location
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1561
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     1
# 2013-02-07  Stefan Teleman <[email protected]>
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
# This is a new addition in GCC 4.7.3 and later. It is broken
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
# on Solaris 12 (it starts patching <pthread.h>) amongst other things.
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
# Hopefully it will be fixed upstream.
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
--- gcc-4.8.2/fixincludes/check.tpl	2012-10-29 09:44:34.000000000 -0700
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
+++ gcc-4.8.2/fixincludes/check.tpl	2013-10-17 11:15:49.089924443 -0700
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
@@ -106,14 +106,20 @@
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
 exitok=true
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     9
 
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
 find * -type f -print > ${TESTDIR}/LIST
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
+cat ${TESTDIR}/LIST | egrep -v 'pthread.h|math_iso.h|comm_err.h|setjmp_iso.h|sys/types.h' > ${TESTDIR}/LIST.2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
+mv ${TESTDIR}/LIST ${TESTDIR}/LIST.OLD
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
+cp -fp ${TESTDIR}/LIST.2 ${TESTDIR}/LIST
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
+touch -r ${TESTDIR}/LIST.OLD -acm ${TESTDIR}/LIST
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
 
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
 #  Special hack for sys/types.h:  the #define-d types for size_t,
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
 #  ptrdiff_t and wchar_t are different for each port.  Therefore,
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
 #  strip off the defined-to type so that the test results are the
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
 #  same for all platforms.
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
 #
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
+if [ -f sys/types.h ] ; then
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
 sed 's/\(#define __[A-Z_]*_TYPE__\).*/\1/' sys/types.h > XX
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
 mv -f XX sys/types.h
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
+fi
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
 
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
 #  The following subshell weirdness is for saving an exit
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
 #  status from within a while loop that reads input.  If you can
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
@@ -125,8 +131,7 @@
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
 do
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
   if [ ! -f ${TESTBASE}/$f ]
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
   then
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
-    echo "Newly fixed header:  $f" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
-    exitok=false
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
+    echo "Newly fixed header: $f (ignore)" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
 
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
   elif cmp $f ${TESTBASE}/$f >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
   then
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
@@ -134,7 +139,7 @@
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
 
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
   else
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
     ${DIFF:-diff} -c $f ${TESTBASE}/$f >&2 || :
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
-    exitok=false
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    43
+    echo "Diffs seen between $f and ${TESTBASE}/$f (ignore)"
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    44
   fi
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    45
 done
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    46
 echo $exitok`
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    47
@@ -151,8 +156,7 @@
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
 do
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
   if [ -s $f ] && [ ! -f ${DESTDIR}/$f ]
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    50
   then
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
-    echo "Missing header fix:  $f" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
-    exitok=false
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    53
+    echo "Missing header fix: $f (ignore)" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    54
   fi
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    55
 done
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    56
 echo $exitok`
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    57
@@ -164,9 +168,9 @@
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    58
   rm -rf inc res LIST
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    59
   cd ..
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    60
   rmdir ${TESTDIR} > /dev/null 2>&1 || :
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    61
-  echo All fixinclude tests pass >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    62
+  echo "All fixinclude tests pass" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    63
 else
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    64
-  echo There were fixinclude test FAILURES  >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    65
+  echo "There were fixinclude test FAILURES (ignore)" >&2
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    66
 fi
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    67
 $exitok[=
3b427cd1199e 17436986 integrate GCC 4.8.x
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    68