git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4034 0c269be4-1314-0410-8aa9-9f06e86f4224tags/v1.9.6
| @@ -25,7 +25,8 @@ Devin Anderson | |||||
| Josh Green | Josh Green | ||||
| Mario Lang | Mario Lang | ||||
| Arnold Krille | Arnold Krille | ||||
| Jan Engelhardt | |||||
| Jan Engelhardt | |||||
| Adrian Knoth | |||||
| --------------------------- | --------------------------- | ||||
| Jackdmp changes log | Jackdmp changes log | ||||
| @@ -33,7 +34,8 @@ Jan Engelhardt | |||||
| 2010-07-07 Stephane Letz <letz@grame.fr> | 2010-07-07 Stephane Letz <letz@grame.fr> | ||||
| * Jan Engelhardt patch for get_cycles on SPARC. | |||||
| * Jan Engelhardt patch for get_cycles on SPARC. | |||||
| * Adrian Knoth hurd.patch, kfreebsd-fix.patch and alpha_ia64-sigsegv.patch from ticket 177. | |||||
| 2010-06-29 Stephane Letz <letz@grame.fr> | 2010-06-29 Stephane Letz <letz@grame.fr> | ||||
| @@ -1012,7 +1012,7 @@ int JackClient::InternalClientLoad(const char* client_name, jack_options_t optio | |||||
| if (va->load_name && (strlen(va->load_name) >= JACK_PATH_MAX)) { | if (va->load_name && (strlen(va->load_name) >= JACK_PATH_MAX)) { | ||||
| jack_error("\"%s\" is too long for a shared object name.\n" | jack_error("\"%s\" is too long for a shared object name.\n" | ||||
| "Please use %lu characters or less.", | "Please use %lu characters or less.", | ||||
| va->load_name, PATH_MAX); | |||||
| va->load_name, JACK_PATH_MAX); | |||||
| int my_status1 = *status | (JackFailure | JackInvalidOption); | int my_status1 = *status | (JackFailure | JackInvalidOption); | ||||
| *status = (jack_status_t)my_status1; | *status = (jack_status_t)my_status1; | ||||
| return 0; | return 0; | ||||
| @@ -53,7 +53,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
| #endif /* WIN32 */ | #endif /* WIN32 */ | ||||
| #if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) | |||||
| #if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) || defined(__unix__) | |||||
| #include <inttypes.h> | #include <inttypes.h> | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #include <sys/types.h> | #include <sys/types.h> | ||||
| @@ -98,14 +98,18 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { | |||||
| jack_error("info.si_errno = %d", info->si_errno); | jack_error("info.si_errno = %d", info->si_errno); | ||||
| jack_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); | jack_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); | ||||
| jack_error("info.si_addr = %p", info->si_addr); | jack_error("info.si_addr = %p", info->si_addr); | ||||
| #if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) | |||||
| for(i = 0; i < NGREG; i++) | for(i = 0; i < NGREG; i++) | ||||
| jack_error("reg[%02d] = 0x" REGFORMAT, i, | jack_error("reg[%02d] = 0x" REGFORMAT, i, | ||||
| #if defined(__powerpc__) | #if defined(__powerpc__) | ||||
| ucontext->uc_mcontext.uc_regs[i] | ucontext->uc_mcontext.uc_regs[i] | ||||
| #elif defined(__sparc__) && defined(__arch64__) | |||||
| ucontext->uc_mcontext.mc_gregs[i] | |||||
| #else | #else | ||||
| ucontext->uc_mcontext.gregs[i] | ucontext->uc_mcontext.gregs[i] | ||||
| #endif | #endif | ||||
| ); | ); | ||||
| #endif /* alpha, ia64, kFreeBSD, arm, hppa */ | |||||
| #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) | #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) | ||||
| # if defined(SIGSEGV_STACK_IA64) | # if defined(SIGSEGV_STACK_IA64) | ||||
| @@ -113,8 +113,7 @@ static inline cycles_t get_cycles (void) | |||||
| #endif | #endif | ||||
| /* everything else but x86, amd64 or ppc */ | |||||
| #if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__) | |||||
| #if defined(__FreeBSD_kernel__) | |||||
| #warning No suitable get_cycles() implementation. Returning 0 instead | #warning No suitable get_cycles() implementation. Returning 0 instead | ||||
| @@ -127,6 +126,18 @@ static inline cycles_t get_cycles(void) | |||||
| #endif | #endif | ||||
| /* everything else but x86, amd64 or ppc */ | |||||
| #if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__) | |||||
| #warning No suitable get_cycles() implementation. Returning 0 instead | |||||
| typedef unsigned long long cycles_t; | |||||
| static inline cycles_t get_cycles(void) | |||||
| { | |||||
| return 0; | |||||
| } | |||||
| #endif | #endif | ||||
| #endif /* __jack_cycles_h__ */ | #endif /* __jack_cycles_h__ */ | ||||
| @@ -79,7 +79,7 @@ def set_options(opt): | |||||
| def configure(conf): | def configure(conf): | ||||
| platform = Utils.detect_platform() | platform = Utils.detect_platform() | ||||
| conf.env['IS_MACOSX'] = platform == 'darwin' | conf.env['IS_MACOSX'] = platform == 'darwin' | ||||
| conf.env['IS_LINUX'] = platform == 'linux' | |||||
| conf.env['IS_LINUX'] = platform == 'linux' or platform == 'posix' | |||||
| conf.env['IS_SUN'] = platform == 'sunos' | conf.env['IS_SUN'] = platform == 'sunos' | ||||
| if conf.env['IS_LINUX']: | if conf.env['IS_LINUX']: | ||||