LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adrian Knoth hurd.patch, kfreebsd-fix.patch and alpha_ia64-sigsegv.patch from ticket 177. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4034 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
sletz 2010-07-07 09:49:05 +00:00
parent 4e8e5e6550
commit caa6cd6c27
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -25,7 +25,8 @@ Devin Anderson
Josh Green
Mario Lang
Arnold Krille
Jan Engelhardt
Jan Engelhardt
Adrian Knoth
---------------------------
Jackdmp changes log
@ -33,7 +34,8 @@ Jan Engelhardt
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>

2
common/JackClient.cpp
View File

@ -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)) {
jack_error("\"%s\" is too long for a shared object name.\n"
"Please use %lu characters or less.",
va->load_name, PATH_MAX);
va->load_name, JACK_PATH_MAX);
int my_status1 = *status | (JackFailure | JackInvalidOption);
*status = (jack_status_t)my_status1;
return 0;

2
common/jack/systemdeps.h
View File

@ -53,7 +53,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#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 <pthread.h>
#include <sys/types.h>

4
dbus/sigsegv.c
View File

@ -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_code = %d (%s)", info->si_code, si_codes[info->si_code]);
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++)
jack_error("reg[%02d] = 0x" REGFORMAT, i,
#if defined(__powerpc__)
ucontext->uc_mcontext.uc_regs[i]
#elif defined(__sparc__) && defined(__arch64__)
ucontext->uc_mcontext.mc_gregs[i]
#else
ucontext->uc_mcontext.gregs[i]
#endif
);
#endif /* alpha, ia64, kFreeBSD, arm, hppa */
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
# if defined(SIGSEGV_STACK_IA64)

15
linux/cycles.h
View File

@ -113,6 +113,19 @@ static inline cycles_t get_cycles (void)
#endif
#if defined(__FreeBSD_kernel__)
#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
/* everything else but x86, amd64 or ppc */
#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
@ -127,6 +140,4 @@ static inline cycles_t get_cycles(void)
#endif
#endif
#endif /* __jack_cycles_h__ */

2
wscript
View File

@ -79,7 +79,7 @@ def set_options(opt):
def configure(conf):
platform = Utils.detect_platform()
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'
if conf.env['IS_LINUX']: