Attachment #56192 for bug #68111

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 278-284 Link Here

(-)./collectors/native/java_profiler/StatelessHeapSnapshotManager_C.cpp (-1 / +1 lines)
278	traceWriteInt32LittleEndian(77);	278	traceWriteInt32LittleEndian(77);
279	#elif defined(__OS400__)	279	#elif defined(__OS400__)
280	traceWriteInt32LittleEndian(88);	280	traceWriteInt32LittleEndian(88);
281	#elif defined(__linux__) && defined(__powerpc64__) \|\| defined(_WIN64) /ts. bug 120479/	281	#elif defined(__linux__) && defined(__powerpc64__) \|\| defined(_WIN64) \|\| defined(__APPLE__) /ts. bug 120479/
282	/* traceWriteInt32LittleEndian(99); */	282	/* traceWriteInt32LittleEndian(99); */
283	#else	283	#else
284	#error "unknown platform"	284	#error "unknown platform"

Lines 17-22 Link Here

(-)./collectors/native/java_profiler/hash.c (+2 lines)
17	/* no malloc.h needed */	17	/* no malloc.h needed */
18	#elif MVS	18	#elif MVS
19	/* no malloc.h needed */	19	/* no malloc.h needed */
		20	#elif __APPLE__
		21	/* no malloc.h needed */
20	#else	22	#else
21	#include <malloc.h>	23	#include <malloc.h>
22	#endif	24	#endif

Lines 30-35 Link Here

(-)./collectors/native/java_profiler/performance.h (+2 lines)
30	#elif __linux__	30	#elif __linux__
31	#include <stdint.h>	31	#include <stdint.h>
32	#define _inline inline	32	#define _inline inline
		33	#elif __APPLE__
		34	#define _inline inline
33	#elif _SOLARIS	35	#elif _SOLARIS
34	#define _inline	36	#define _inline
35	#elif _AIX	37	#elif _AIX

Lines 14-19 Link Here

(-)./framework/HCLauncher/launcher_md.c (+8 lines)
14	#endif	14	#endif
15	#include "launcher_common.h"	15	#include "launcher_common.h"
16		16
		17	#ifdef __APPLE__
		18	#ifdef HAVE_CRT_EXTERNS_H
		19	#include <crt-externs.h>
		20	#endif
		21	#endif
		22
17	#ifdef _DEBUG	23	#ifdef _DEBUG
18	extern FILE *trcFile;	24	extern FILE *trcFile;
19	#endif	25	#endif
Lines 414-419 Link Here
414		420
415	#ifdef _WIN32	421	#ifdef _WIN32
416	return GetEnvironmentStrings(); /* Return a string of environment variables */	422	return GetEnvironmentStrings(); /* Return a string of environment variables */
		423	#elif __APPLE__
		424	return _NSGetEnviron();
417	#else	425	#else
418		426
419	#ifdef _DEBUG	427	#ifdef _DEBUG

Lines 78-83 Link Here

(-)./framework/RACommon/RAComm.c (+3 lines)
78	#elif _SOLARIS	78	#elif _SOLARIS
79	#define _inline	79	#define _inline
80	#define _NO_ATOMIC_CAS 1	80	#define _NO_ATOMIC_CAS 1
		81	#elif __APPLE__
		82	#define _inline
		83	#define _NO_ATOMIC_CAS 1
81	#elif _HPUX	84	#elif _HPUX
82	#include <unistd.h>	85	#include <unistd.h>
83	#define _inline	86	#define _inline

Lines 40-45 Link Here

(-)./framework/RACommon/RATypes.h (+5 lines)
40	#include <unistd.h>	40	#include <unistd.h>
41	#endif	41	#endif
42		42
		43	#ifdef __APPLE__
		44	#include <stdlib.h>
		45	#include <stdbool.h>
		46	#endif
		47
43	#if defined(_WIN32)	48	#if defined(_WIN32)
44	#define FILE_PATH_SEPARATOR ';'	49	#define FILE_PATH_SEPARATOR ';'
45	#define FILE_PATH_SEPARATOR_STR ";"	50	#define FILE_PATH_SEPARATOR_STR ";"

Lines 109-114 Link Here

(-)./framework/RASharedMemory/osslatch.h (+14 lines)
109	/* The lock word size in abilock_t is the same for both 32- and 64-bit */	109	/* The lock word size in abilock_t is the same for both 32- and 64-bit */
110	#include <abi_mutex.h>	110	#include <abi_mutex.h>
111	typedef volatile abilock_t OSSLock ;	111	typedef volatile abilock_t OSSLock ;
		112	#elif defined __APPLE__
		113	#include <libkern/OSAtomic.h>
		114	#include <pthread.h>
		115	typedef OSSpinLock OSSLock ;
112	#else	116	#else
113	typedef volatile int OSSLock ;	117	typedef volatile int OSSLock ;
114	#endif	118	#endif
Lines 345-350 Link Here
345		349
346		350
347	/******************************************************************************/	351	/******************************************************************************/
		352	#elif defined __APPLE__
		353
		354	#define oss_lockaddr(pLatch) (&((pLatch)->lock))
		355	#define oss_trylock(pLatch) (OSS_LATCH_UNLOCK==(OSSpinLockTry(oss_lockaddr(pLatch))))
		356	#define oss_checklock(pLatch) (OSS_LATCH_UNLOCK==(*oss_lockaddr(pLatch)))
		357	#define oss_unlock(pLatch) ((void)OSSpinLockUnlock(oss_lockaddr(pLatch)))
		358	#define oss_initlock(pLatch) ((void)(oss_unlock((pLatch))))
		359
		360
		361	/******************************************************************************/
348	#elif defined SQL_OS400 /@d170450ssu/	362	#elif defined SQL_OS400 /@d170450ssu/
349		363
350	/*	364	/*

Lines 19-25 Link Here

(-)./hcbnd.mak (-1 / +1 lines)
19	all: libhcbnd.$(EXT_LIB)	19	all: libhcbnd.$(EXT_LIB)
20		20
21	libhcbnd.$(DYNAMIC_EXT_LIB): $(HCBND_OBJ)	21	libhcbnd.$(DYNAMIC_EXT_LIB): $(HCBND_OBJ)
22	$(LINK) $(HCBND_FLAGS) $(HCBND_OBJ) -o packaging/lib/$@	22	$(LINK) -Wl,-single_module $(HCBND_FLAGS) $(HCBND_OBJ) -o packaging/lib/$@
23		23
24	libhcbnd.$(STATIC_EXT_LIB): $(HCBND_OBJ)	24	libhcbnd.$(STATIC_EXT_LIB): $(HCBND_OBJ)
25	$(CXX_AR) packaging/lib/$@ $?	25	$(CXX_AR) packaging/lib/$@ $?

Lines 17-23 Link Here

(-)./hcthread.mak (-1 / +1 lines)
17	all: libhcthread.$(EXT_LIB)	17	all: libhcthread.$(EXT_LIB)
18		18
19	libhcthread.$(DYNAMIC_EXT_LIB): $(HCTHREAD_OBJ)	19	libhcthread.$(DYNAMIC_EXT_LIB): $(HCTHREAD_OBJ)
20	$(LINK) $(HCTHREAD_FLAGS) $(HCTHREAD_OBJ) -o packaging/lib/$@	20	$(LINK) -Wl,-single_module $(HCTHREAD_FLAGS) $(HCTHREAD_OBJ) -o packaging/lib/$@
21		21
22	libhcthread.$(STATIC_EXT_LIB): $(HCTHREAD_OBJ)	22	libhcthread.$(STATIC_EXT_LIB): $(HCTHREAD_OBJ)
23	$(CXX_AR) packaging/lib/$@ $?	23	$(CXX_AR) packaging/lib/$@ $?




	DYNAMIC_EXT_LIB = so
	STATIC_EXT_LIB = a
endif
ifeq ($(UNAME), Darwin)
     	# TODO later test for x86
	BUILD_PLATFORM = darwin_ppc
	JDK_PLATFORM = darwin
	DYNAMIC_EXT_LIB = dylib
	STATIC_EXT_LIB = a
	XML_PARSER_TYPE = java
endif
ifeq ($(UNAME), OS/390)
	BUILD_PLATFORM = os390
	JDK_PLATFORM = os390

DEP_INCLUDES_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JDK_PLATFORM)
DEP_INCLUDES_XERCESC = -I$(XERCESC_HOME)/include

DEP_LINKFLAGS_CBE = -L../cbe/packaging -lcbe
DEP_LINKFLAGS_XERCESC = -L$(XERCESC_HOME)/lib -lxerces-c

#




#
# Global include for Darwin/PowerPC
#
CC = gcc 
#CXX = $(CC)
CXX = g++ 
LINK = gcc
#LINKCPP = $(LINK)
LINKCPP = g++
SHLIB_FLAG = -dynamiclib
CXX_AR=$(AR) cr
STLIB_FLAG =  -Xlinker -Bstatic 

#
# Suppress association of suffix .c with suffix .y by stating new order of evaluation of suffixes
#
.SUFFIXES:
.SUFFIXES: .h .hpp .cpp .c .o

#
# Make
#
MAKE = make

#
# C flags
#
CFLAGS =
CFLAGSEXE = $(CFLAGS)

#
# C++ flags
#
CXXFLAGS = $(CFLAGS)

#
# Includes
#
INCLUDES = $(DEP_INCLUDES_CBE) $(DEP_INCLUDES_JAVA) $(DEP_INCLUDES_XERCESC) $(SRC_INCLUDES)

#
# Linkedit flags
#
LINKFLAGS = -L$(SRC_IDIR)/packaging/lib 
DLLLINKFLAGS = $(SHLIB_FLAG) $(LINKFLAGS)
EXELINKFLAGS = $(LINKFLAGS)

#
# Defines
# Built-in defines: __APPLE__
#
DEFINES = -DSQLUNIX -DENW -DREENTRANT -D_REENTRANT

#
# Link flags
#
HCBND_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
HCCLCO_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
HCCLDT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
HCCLS_FLAGS = $(DLLLINKFLAGS) -lhcclco
HCCLSERC_FLAGS = $(DLLLINKFLAGS) $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclsert -lhccls
HCCLSERT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
HCCLSM_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
HCJBND_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
HCLAUNCH_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
PIAGENT_LIBS = -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm 
PIAGENT_FLAGS =  $(DLLLINKFLAGS) -Wl,-single_module
ifdef STATIC_LINKING
    PIAGENT_STATIC_FLAGS =  $(STLIB_FLAG)  
    PIAGENT_STATIC_STDLIB = -nostdlib  -lstdc++ -lgcc -lgcc_eh 
    RASERVER_STATIC_FLAGS = $(STLIB_FLAG)
    RASERVER_STATIC_LIBS =  -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
    RASERVER_STATIC_STDLIB = -nostdlib -lstdc++ -lgcc -lgcc_eh
endif
# FIXME the next line uses '-m'; actually the inlines should not be there at all
RASERVER_FLAGS = -m $(CFLAGSEXE) $(EXELINKFLAGS) -undefined dynamic_lookup $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
HCTHREAD_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
TPTPSHM_FLAGS = $(DLLLINKFLAGS) -liconv
CHKPASS_FLAGS = 

Lines 39-44 Link Here

(-)./makefile (+9 lines)
39	$(MAKE) -f tptpShm.mak	39	$(MAKE) -f tptpShm.mak
40	zip libtptpShm.$(BUILD_PLATFORM).zip libtptpShm.so	40	zip libtptpShm.$(BUILD_PLATFORM).zip libtptpShm.so
41	endif	41	endif
		42	ifeq ($(BUILD_PLATFORM), darwin_ppc)
		43	# $(MAKE) -f ChkPass.mak
		44	$(MAKE) -f tptpShm.mak
		45	zip libtptpShm.$(BUILD_PLATFORM).zip libtptpShm.dylib
		46	endif
42	ifeq ($(BUILD_PLATFORM), linux_ia32)	47	ifeq ($(BUILD_PLATFORM), linux_ia32)
43	$(MAKE) -f ChkPass.mak	48	$(MAKE) -f ChkPass.mak
44	$(MAKE) -f tptpShm.mak	49	$(MAKE) -f tptpShm.mak
Lines 129-134 Link Here
129	$(MAKE) -f ChkPass.mak clean	134	$(MAKE) -f ChkPass.mak clean
130	$(MAKE) -f tptpShm.mak clean	135	$(MAKE) -f tptpShm.mak clean
131	endif	136	endif
		137	ifeq ($(BUILD_PLATFORM), darwin_ppc)
		138	$(MAKE) -f ChkPass.mak clean
		139	$(MAKE) -f tptpShm.mak clean
		140	endif
132	ifeq ($(BUILD_PLATFORM), linux_ia32)	141	ifeq ($(BUILD_PLATFORM), linux_ia32)
133	$(MAKE) -f ChkPass.mak clean	142	$(MAKE) -f ChkPass.mak clean
134	$(MAKE) -f tptpShm.mak clean	143	$(MAKE) -f tptpShm.mak clean

Lines 36-43 Link Here

(-)./piAgent.mak (+4 lines)
36	ifeq ($(BUILD_PLATFORM), os390)	36	ifeq ($(BUILD_PLATFORM), os390)
37	$(LINKCPP) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)	37	$(LINKCPP) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
38	else	38	else
		39	ifeq ($(BUILD_PLATFORM), darwin_ppc)
		40	$(LINKCPP) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
		41	else
39	$(LINK) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)	42	$(LINK) $(PIAGENT_FLAGS) $(PIAGENT_OBJ) -o packaging/lib/$@ $(PIAGENT_STATIC_FLAGS) $(PIAGENT_LIBS) $(PIAGENT_STATIC_STDLIB)
40	endif	43	endif
		44	endif
41		45
42	ifeq ($(BUILD_PLATFORM), hpux)	46	ifeq ($(BUILD_PLATFORM), hpux)
43	$(SRC_IDIR)/collectors/native/java_profiler/performance.o: $(SRC_IDIR)/collectors/native/java_profiler/performance.c	47	$(SRC_IDIR)/collectors/native/java_profiler/performance.o: $(SRC_IDIR)/collectors/native/java_profiler/performance.c

Return to bug 68111

Lines 46-51 Link Here

(-)./include.common (-1 / +9 lines)
46	DYNAMIC_EXT_LIB = so	46	DYNAMIC_EXT_LIB = so
47	STATIC_EXT_LIB = a	47	STATIC_EXT_LIB = a
48	endif	48	endif
		49	ifeq ($(UNAME), Darwin)
		50	# TODO later test for x86
		51	BUILD_PLATFORM = darwin_ppc
		52	JDK_PLATFORM = darwin
		53	DYNAMIC_EXT_LIB = dylib
		54	STATIC_EXT_LIB = a
		55	XML_PARSER_TYPE = java
		56	endif
49	ifeq ($(UNAME), OS/390)	57	ifeq ($(UNAME), OS/390)
50	BUILD_PLATFORM = os390	58	BUILD_PLATFORM = os390
51	JDK_PLATFORM = os390	59	JDK_PLATFORM = os390
Lines 89-95 Link Here
89	DEP_INCLUDES_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JDK_PLATFORM)	97	DEP_INCLUDES_JAVA = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JDK_PLATFORM)
90	DEP_INCLUDES_XERCESC = -I$(XERCESC_HOME)/include	98	DEP_INCLUDES_XERCESC = -I$(XERCESC_HOME)/include
91		99
92	DEP_LINKFLAGS_CBE = -L ../cbe/packaging -lcbe	100	DEP_LINKFLAGS_CBE = -L../cbe/packaging -lcbe
93	DEP_LINKFLAGS_XERCESC = -L$(XERCESC_HOME)/lib -lxerces-c	101	DEP_LINKFLAGS_XERCESC = -L$(XERCESC_HOME)/lib -lxerces-c
94		102
95	#	103	#

Line 0 Link Here

(-)./include.darwin_ppc (+79 lines)
		1	#
		2	# Global include for Darwin/PowerPC
		3	#
		4	CC = gcc
		5	#CXX = $(CC)
		6	CXX = g++
		7	LINK = gcc
		8	#LINKCPP = $(LINK)
		9	LINKCPP = g++
		10	SHLIB_FLAG = -dynamiclib
		11	CXX_AR=$(AR) cr
		12	STLIB_FLAG = -Xlinker -Bstatic
		13
		14	#
		15	# Suppress association of suffix .c with suffix .y by stating new order of evaluation of suffixes
		16	#
		17	.SUFFIXES:
		18	.SUFFIXES: .h .hpp .cpp .c .o
		19
		20	#
		21	# Make
		22	#
		23	MAKE = make
		24
		25	#
		26	# C flags
		27	#
		28	CFLAGS =
		29	CFLAGSEXE = $(CFLAGS)
		30
		31	#
		32	# C++ flags
		33	#
		34	CXXFLAGS = $(CFLAGS)
		35
		36	#
		37	# Includes
		38	#
		39	INCLUDES = $(DEP_INCLUDES_CBE) $(DEP_INCLUDES_JAVA) $(DEP_INCLUDES_XERCESC) $(SRC_INCLUDES)
		40
		41	#
		42	# Linkedit flags
		43	#
		44	LINKFLAGS = -L$(SRC_IDIR)/packaging/lib
		45	DLLLINKFLAGS = $(SHLIB_FLAG) $(LINKFLAGS)
		46	EXELINKFLAGS = $(LINKFLAGS)
		47
		48	#
		49	# Defines
		50	# Built-in defines: __APPLE__
		51	#
		52	DEFINES = -DSQLUNIX -DENW -DREENTRANT -D_REENTRANT
		53
		54	#
		55	# Link flags
		56	#
		57	HCBND_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
		58	HCCLCO_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
		59	HCCLDT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
		60	HCCLS_FLAGS = $(DLLLINKFLAGS) -lhcclco
		61	HCCLSERC_FLAGS = $(DLLLINKFLAGS) $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclsert -lhccls
		62	HCCLSERT_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls -lhcclsm
		63	HCCLSM_FLAGS = $(DLLLINKFLAGS) -lhcclco -lhccls
		64	HCJBND_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
65	HCLAUNCH_FLAGS = $(DLLLINKFLAGS) -liconv -Wl,-single_module
66	PIAGENT_LIBS = -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
67	PIAGENT_FLAGS = $(DLLLINKFLAGS) -Wl,-single_module
68	ifdef STATIC_LINKING
69	PIAGENT_STATIC_FLAGS = $(STLIB_FLAG)
70	PIAGENT_STATIC_STDLIB = -nostdlib -lstdc++ -lgcc -lgcc_eh
71	RASERVER_STATIC_FLAGS = $(STLIB_FLAG)
72	RASERVER_STATIC_LIBS = -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
73	RASERVER_STATIC_STDLIB = -nostdlib -lstdc++ -lgcc -lgcc_eh
74	endif
75	# FIXME the next line uses '-m'; actually the inlines should not be there at all
76	RASERVER_FLAGS = -m $(CFLAGSEXE) $(EXELINKFLAGS) -undefined dynamic_lookup $(DEP_LINKFLAGS_CBE) $(DEP_LINKFLAGS_XERCESC) -lhcclco -lhcclserc -lhcclsert -lhccls -lhcclsm
77	HCTHREAD_FLAGS = $(DLLLINKFLAGS) -lhcbnd -lhcclco -lhccldt -lhccls -lhcclsm
78	TPTPSHM_FLAGS = $(DLLLINKFLAGS) -liconv
79	CHKPASS_FLAGS =