June 2007 - Wine-commits - list.winehq.org

Jeff Latimer : msi: Use the langbuff len rather than the versionbuff len when allocating the langbuff .
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 8521cb867744b9c5ef484c808793f95aa8bb2abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8521cb867744b9c5ef484c808… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jun 10 17:43:30 2007 +1000 msi: Use the langbuff len rather than the versionbuff len when allocating the langbuff. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 927c47f..a09984e 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1206,7 +1206,7 @@ UINT WINAPI MsiGetFileVersionA(LPCSTR szFilePath, LPSTR lpVersionBuf, if( lpLangBuf && pcchLangBuf && *pcchLangBuf ) { - lpwLangBuff = msi_alloc(*pcchVersionBuf*sizeof(WCHAR)); + lpwLangBuff = msi_alloc(*pcchLangBuf*sizeof(WCHAR)); if( !lpwLangBuff ) goto end; }

1 0

Dmitry Timoshkov : user32: Do not hardcode cp1252 for an icon/title font.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 7d482d8e7eee0ddeba59b7006be2f041bf77d50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d482d8e7eee0ddeba59b7006… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 10 18:14:56 2007 +0900 user32: Do not hardcode cp1252 for an icon/title font. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f8feb0d..c5de419 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -314,7 +314,7 @@ static ICONMETRICSW icon_metrics = 75, /* iHorzSpacing */ 75, /* iVertSpacing */ TRUE, /* iTitleWrap */ - { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH } /* lfFont */ };

1 0

Jeff Latimer : shell32: Fix possible dereference of NULL ptr.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: f16e2c3a27a1e9bf15c376a8b6a484b3fa18cc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16e2c3a27a1e9bf15c376a8b… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jun 10 17:42:50 2007 +1000 shell32: Fix possible dereference of NULL ptr. --- dlls/shell32/shelllink.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0b7094a..aa21a4a 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -584,8 +584,12 @@ static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr ) { count = MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, NULL, 0 ); str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) ); - if( str ) - MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count ); + if( !str ) + { + HeapFree( GetProcessHeap(), 0, temp ); + return E_OUTOFMEMORY; + } + MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count ); HeapFree( GetProcessHeap(), 0, temp ); } else

1 0

Misha Koshelev : shell32/tests: Add test for unquoted %1 in command and ddeexec keys.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 0678f6d16894b377607a50d57a69753f635fc33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0678f6d16894b377607a50d57… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:25:21 2007 -0500 shell32/tests: Add test for unquoted %1 in command and ddeexec keys. --- dlls/shell32/tests/shlexec.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b65066..7fc34fb 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1062,6 +1062,10 @@ static dde_tests_t dde_tests[] = {"", "[open(\"%1\")]", "shlexec", "dde", NULL, FALSE, "[open(\"%s\")]", 0x0, 33}, {"\"%1\"", "[open(\"%1\")]", "shlexec", "dde", NULL, TRUE, "[open(\"%s\")]", 0x0, 33}, + /* Test unquoted %1 in command and ddeexec + * (test filename has space) */ + {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", 0xa, 33}, + /* Test ifexec precedence over ddeexec */ {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]", 0x0, 33},

1 0

Misha Koshelev : shell32/tests: Allow testing for arbitrary number of command line arguments in DDE tests.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: b43cac0b049b4983efdb4ee9352a398a9743b9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43cac0b049b4983efdb4ee93… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:25:17 2007 -0500 shell32/tests: Allow testing for arbitrary number of command line arguments in DDE tests. --- dlls/shell32/tests/shlexec.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4f0aa8c..0b65066 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1044,7 +1044,7 @@ typedef struct const char* application; const char* topic; const char* ifexec; - BOOL bExpectCmdLine; + int expectedArgs; const char* expectedDdeExec; int todo; int rc; @@ -1071,7 +1071,7 @@ static dde_tests_t dde_tests[] = /* Test default DDE application */ {"", "[open(\"%1\")]", NULL, "dde", NULL, FALSE, "[open(\"%s\")]", 0x0, 33}, - {NULL, NULL, NULL, NULL, 0x0, 0} + {NULL, NULL, NULL, NULL, NULL, 0, 0x0, 0} }; static DWORD ddeInst; @@ -1191,13 +1191,13 @@ static void test_dde(void) { if ((test->todo & 0x2)==0) { - okChildInt("argcA", test->bExpectCmdLine ? 4 : 3); + okChildInt("argcA", test->expectedArgs + 3); } else todo_wine { - okChildInt("argcA", test->bExpectCmdLine ? 4 : 3); + okChildInt("argcA", test->expectedArgs + 3); } - if (test->bExpectCmdLine) + if (test->expectedArgs == 1) { if ((test->todo & 0x4) == 0) {

1 0

Misha Koshelev : shell32/tests: Use ShellExecuteEx with SEE_MASK_FLAG_DDEWAIT and SEE_MASK_FLAG_NO_UI for DDE tests .
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 12297d64efae194f0a4ccc2f660490104b197377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12297d64efae194f0a4ccc2f6… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:22:44 2007 -0500 shell32/tests: Use ShellExecuteEx with SEE_MASK_FLAG_DDEWAIT and SEE_MASK_FLAG_NO_UI for DDE tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e525ee2..621ec86 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1128,7 +1128,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) assert(info && info->filename); PostThreadMessage(info->threadIdParent, WM_QUIT, - shell_execute(NULL, info->filename, NULL, NULL), + shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL), 0L); ExitThread(0); }

1 0

Misha Koshelev : shell32/tests: Expand default DDE application name tests to conform to win98.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ca6387b32993715ee0cfd0fa5ab24c0ee3a1d83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6387b32993715ee0cfd0fa5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:25:13 2007 -0500 shell32/tests: Expand default DDE application name tests to conform to win98. --- dlls/shell32/tests/shlexec.c | 74 +++++++++++++++++++++++++++--------------- 1 files changed, 48 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 621ec86..4f0aa8c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1232,50 +1232,55 @@ static void test_dde(void) assert(DdeUninitialize(ddeInst)); } +#define DDE_DEFAULT_APP_VARIANTS 2 typedef struct { const char* command; - const char* expectedDdeApplication; + const char* expectedDdeApplication[DDE_DEFAULT_APP_VARIANTS]; int todo; - int rc; + int rc[DDE_DEFAULT_APP_VARIANTS]; } dde_default_app_tests_t; static dde_default_app_tests_t dde_default_app_tests[] = { + /* Windows XP and 98 handle default DDE app names in different ways. + * The application name we see in the first test determines the pattern + * of application names and return codes we will look for. */ + /* Test unquoted existing filename with a space */ - {"%s\\test file.exe", "test file", 0x0, 33}, - {"%s\\test file.exe param", "test file", 0x0, 33}, + {"%s\\test file.exe", {"test file", "test"}, 0x0, {33, 33}}, + {"%s\\test file.exe param", {"test file", "test"}, 0x0, {33, 33}}, /* Test quoted existing filename with a space */ - {"\"%s\\test file.exe\"", "test file", 0x0, 33}, - {"\"%s\\test file.exe\" param", "test file", 0x0, 33}, + {"\"%s\\test file.exe\"", {"test file", "test file"}, 0x0, {33, 33}}, + {"\"%s\\test file.exe\" param", {"test file", "test file"}, 0x0, {33, 33}}, /* Test unquoted filename with a space that doesn't exist, but * test2.exe does */ - {"%s\\test2 file.exe", "test2", 0x0, 33}, - {"%s\\test2 file.exe param", "test2", 0x0, 33}, + {"%s\\test2 file.exe", {"test2", "test2"}, 0x0, {33, 33}}, + {"%s\\test2 file.exe param", {"test2", "test2"}, 0x0, {33, 33}}, /* Test quoted filename with a space that does not exist */ - {"\"%s\\test2 file.exe\"", "", 0x0, 5}, - {"\"%s\\test2 file.exe\" param", "", 0x0, 5}, + {"\"%s\\test2 file.exe\"", {"", "test2 file"}, 0x0, {5, 33}}, + {"\"%s\\test2 file.exe\" param", {"", "test2 file"}, 0x0, {5, 33}}, /* Test filename supplied without the extension */ - {"%s\\test2", "test2", 0x0, 33}, - {"%s\\test2 param", "test2", 0x0, 33}, + {"%s\\test2", {"test2", "test2"}, 0x0, {33, 33}}, + {"%s\\test2 param", {"test2", "test2"}, 0x0, {33, 33}}, /* Test an unquoted nonexistent filename */ - {"%s\\notexist.exe", "", 0x0, 5}, - {"%s\\notexist.exe param", "", 0x0, 5}, + {"%s\\notexist.exe", {"", "notexist"}, 0x0, {5, 33}}, + {"%s\\notexist.exe param", {"", "notexist"}, 0x0, {5, 33}}, /* Test an application that will be found on the path */ - {"cmd", "cmd", 0x0, 33}, - {"cmd param", "cmd", 0x0, 33}, + {"cmd", {"cmd", "cmd"}, 0x0, {33, 33}}, + {"cmd param", {"cmd", "cmd"}, 0x0, {33, 33}}, /* Test an application that will not be found on the path */ - {"xyzwxyzwxyz", "", 0x0, 5}, - {"xyzwxyzwxyz param", "", 0x0, 5}, + {"xyzwxyzwxyz", {"", "xyzwxyzwxyz"}, 0x0, {5, 33}}, + {"xyzwxyzwxyz param", {"", "xyzwxyzwxyz"}, 0x0, {5, 33}}, - {NULL, NULL, 0, 0} + {NULL, {NULL}, 0, {0}} }; static void test_dde_default_app(void) @@ -1287,7 +1292,7 @@ static void test_dde_default_app(void) char params[1024]; DWORD threadId; MSG msg; - int rc; + int rc, which = 0; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | @@ -1321,29 +1326,46 @@ static void test_dde_default_app(void) assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId)); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); rc = msg.wParam > 32 ? 33 : msg.wParam; + + /* First test, find which set of test data we expect to see */ + if (test == dde_default_app_tests) + { + int i; + for (i=0; i<DDE_DEFAULT_APP_VARIANTS; i++) + { + if (!strcmp(ddeApplication, test->expectedDdeApplication[i])) + { + which = i; + break; + } + } + if (i == DDE_DEFAULT_APP_VARIANTS) + skip("Default DDE application test does not match any available results, using first expected data set.\n"); + } + if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc[which], "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc[which], "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } if (rc == 33) { if ((test->todo & 0x2)==0) { - ok(!strcmp(ddeApplication, test->expectedDdeApplication), + ok(!strcmp(ddeApplication, test->expectedDdeApplication[which]), "Expected application '%s', got '%s'\n", - test->expectedDdeApplication, ddeApplication); + test->expectedDdeApplication[which], ddeApplication); } else todo_wine { - ok(!strcmp(ddeApplication, test->expectedDdeApplication), + ok(!strcmp(ddeApplication, test->expectedDdeApplication[which]), "Expected application '%s', got '%s'\n", - test->expectedDdeApplication, ddeApplication); + test->expectedDdeApplication[which], ddeApplication); } }

1 0

Misha Koshelev : shell32/tests: Simplify DDE thread and message loop.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 37deec748d6ecebe415b4c1082bcfcfae14499e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37deec748d6ecebe415b4c108… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:20:51 2007 -0500 shell32/tests: Simplify DDE thread and message loop. --- dlls/shell32/tests/shlexec.c | 46 ++++++++++------------------------------- 1 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 311867c..b2c62c5 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1125,12 +1125,12 @@ typedef struct static DWORD CALLBACK ddeThread(LPVOID arg) { dde_thread_info_t *info = (dde_thread_info_t *)arg; - int rc; - assert(info && info->filename); - rc=shell_execute(NULL, info->filename, NULL, NULL); - PostThreadMessage(info->threadIdParent, WM_QUIT, 0, 0L); - ExitThread(rc); + PostThreadMessage(info->threadIdParent, + WM_QUIT, + shell_execute(NULL, info->filename, NULL, NULL), + 0L); + ExitThread(0); } /* ShellExecute won't successfully send DDE commands to console applications after starting them, @@ -1144,7 +1144,6 @@ static void test_dde(void) dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_tests_t* test; char params[1024]; - HANDLE hThread; MSG msg; int rc; @@ -1174,20 +1173,9 @@ static void test_dde(void) denyNextConnection = TRUE; ddeExec[0] = 0; - hThread = CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL); - assert(hThread); - while (GetMessage(&msg, NULL, 0, 0)) - { - /* Need a message loop for DDE server */ - TranslateMessage(&msg); - DispatchMessage(&msg); - } - rc = WaitForSingleObject(hThread, 5000); - assert(rc == WAIT_OBJECT_0); - - GetExitCodeThread(hThread, (DWORD *)&rc); - if (rc > 32) - rc=33; + assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); + while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); + rc = msg.wParam > 32 ? 33 : msg.wParam; if ((test->todo & 0x1)==0) { ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, @@ -1296,7 +1284,6 @@ static void test_dde_default_app(void) dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; char params[1024]; - HANDLE hThread; MSG msg; int rc; @@ -1329,20 +1316,9 @@ static void test_dde_default_app(void) * so don't wait for it */ SetEvent(hEvent); - hThread = CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL); - assert(hThread); - while (GetMessage(&msg, NULL, 0, 0)) - { - /* Need a message loop for DDE server */ - TranslateMessage(&msg); - DispatchMessage(&msg); - } - rc = WaitForSingleObject(hThread, 5000); - assert(rc == WAIT_OBJECT_0); - - GetExitCodeThread(hThread, (DWORD *)&rc); - if (rc > 32) - rc=33; + assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); + while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); + rc = msg.wParam > 32 ? 33 : msg.wParam; if ((test->todo & 0x1)==0) { ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call,

1 0

Misha Koshelev : shell32/tests: Save threadid from CreateThread as required by winme/98/95.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ee3147f434fa0142aa3eb390ee98735815647b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3147f434fa0142aa3eb390e… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sat Jun 9 00:20:56 2007 -0500 shell32/tests: Save threadid from CreateThread as required by winme/98/95. --- dlls/shell32/tests/shlexec.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b2c62c5..e525ee2 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1144,6 +1144,7 @@ static void test_dde(void) dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_tests_t* test; char params[1024]; + DWORD threadId; MSG msg; int rc; @@ -1173,7 +1174,7 @@ static void test_dde(void) denyNextConnection = TRUE; ddeExec[0] = 0; - assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); + assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId)); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); rc = msg.wParam > 32 ? 33 : msg.wParam; if ((test->todo & 0x1)==0) @@ -1284,6 +1285,7 @@ static void test_dde_default_app(void) dde_thread_info_t info = { filename, GetCurrentThreadId() }; const dde_default_app_tests_t* test; char params[1024]; + DWORD threadId; MSG msg; int rc; @@ -1316,7 +1318,7 @@ static void test_dde_default_app(void) * so don't wait for it */ SetEvent(hEvent); - assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); + assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId)); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); rc = msg.wParam > 32 ? 33 : msg.wParam; if ((test->todo & 0x1)==0)

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: aafc07086ec49c2efa25eb306d26c32ec1292355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafc07086ec49c2efa25eb306… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 20:27:08 2007 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 39 +++++++++++++++++++++++++++++---------- tools/config.sub | 36 +++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/tools/config.guess b/tools/config.guess index c085f4f..951383e 100755 --- a/tools/config.guess +++ b/tools/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -211,7 +212,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -780,7 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -831,6 +835,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -947,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1205,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/tools/config.sub b/tools/config.sub index 4d936e2..c060f44 100755 --- a/tools/config.sub +++ b/tools/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-04-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,16 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,6 +276,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -317,13 +318,13 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -367,7 +368,7 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -682,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -909,6 +914,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +929,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1214,7 +1226,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1378,9 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1421,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;;

1 0