Ticket #3727: hg

File hg, 2.0 KB (added by donn, 4 years ago)

context diffs per 6.12.0.20091121

Line 
1*** compiler/main/DriverPipeline.hs.orig        Sat Nov 21 10:10:30 2009
2--- compiler/main/DriverPipeline.hs     Wed Dec  2 15:36:19 2009
3***************
4*** 1417,1423 ****
5 
6      let
7        thread_opts | WayThreaded `elem` ways = [
8! #if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
9                        "-lpthread"
10  #endif
11  #if defined(osf3_TARGET_OS)
12--- 1417,1423 ----
13 
14      let
15        thread_opts | WayThreaded `elem` ways = [
16! #if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS) && !defined(haiku_TARGET_OS)
17                        "-lpthread"
18  #endif
19  #if defined(osf3_TARGET_OS)
20*** configure.ac.orig   Sat Nov 21 10:10:30 2009
21--- configure.ac        Wed Dec  2 15:36:19 2009
22***************
23*** 296,302 ****
24 
25  checkOS() {
26      case $1 in
27!     linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
28          ;;
29      *)
30          echo "Unknown OS '$1'"
31--- 296,302 ----
32 
33  checkOS() {
34      case $1 in
35!     linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
36          ;;
37      *)
38          echo "Unknown OS '$1'"
39*** libraries/unix/config.guess.orig    Sat Nov 21 10:19:03 2009
40--- libraries/unix/config.guess Wed Dec  2 15:36:19 2009
41***************
42*** 1199,1204 ****
43--- 1199,1207 ----
44      BePC:BeOS:*:*)    # BeOS running on Intel PC compatible.
45        echo i586-pc-beos
46        exit ;;
47+     BePC:Haiku:*:*)   # BeOS running on Intel PC compatible.
48+       echo i586-pc-haiku
49+       exit ;;
50      SX-4:SUPER-UX:*:*)
51        echo sx4-nec-superux${UNAME_RELEASE}
52        exit ;;
53*** rts/posix/GetTime.c.orig    Sat Nov 21 10:10:30 2009
54--- rts/posix/GetTime.c Wed Dec  2 15:36:19 2009
55***************
56*** 153,159 ****
57  nat
58  getPageFaults(void)
59  {
60! #if !defined(HAVE_GETRUSAGE) || irix_HOST_OS
61      return 0;
62  #else
63      struct rusage t;
64--- 153,159 ----
65  nat
66  getPageFaults(void)
67  {
68! #if !defined(HAVE_GETRUSAGE) || irix_HOST_OS || haiku_HOST_OS
69      return 0;
70  #else
71      struct rusage t;