ChangeLogTag: Fri Nov 12 09:10:28 2004 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 61 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b6693f2ea8..04efd461ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+Fri Nov 12 09:10:28 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-integritySCA.h:
+        * include/makeinclude/platform_integrity_ghs.GNU:
+
+          Merged in changes from TAO 1.3a.
+
 Fri Nov 12 09:48:22 2004  Steve Huston  <shuston@riverace.com>
 
-	* ace/ACE.cpp (terminate_process): Return 0 for success (not 1) and
-	  -1 for failure (not 0). Thanks to Russell Mora for this fix.
+        * ace/ACE.cpp (terminate_process): Return 0 for success (not 1) and
+          -1 for failure (not 0). Thanks to Russell Mora for this fix.
 
 Fri Nov 12 06:33:02 2004  Chad Elliott  <elliott_c@ociweb.com>
 
@@ -13,8 +20,8 @@ Fri Nov 11 12:29:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
 
         * include/makeinclude/platform_vxworks5.5.x.GNU:
         * bin/MakeProjectCreator/templates/gnu.mpd:
-	* ace/config-vxworks5.x.h:
-	  More changes to accommodate VxWorks 5.5.1 builds.
+        * ace/config-vxworks5.x.h:
+          More changes to accommodate VxWorks 5.5.1 builds.
 
 Thu Nov 11 19:05:45 2004  Krishnakumar B  <kitty@spam.invalid.domain>
 
@@ -64,7 +71,7 @@ Thu Nov 11 17:27:24 2004  Kobi Cohen-Arazi  <kobi.cohenarazi@gmail.com>
         Fixed handle_timeout conditional test to check the max_size
         against the size of the file and not the value of a pointer. Fix
         init to handle re-init correctly. When wipeout_logfile_ is true,
-	than close the file and reopen it truncated, when wipeout_logfile_
+        than close the file and reopen it truncated, when wipeout_logfile_
         is false, don't reopen the file unless its not open already.
 
 Thu Nov 11 08:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/ace/config-integritySCA.h b/ace/config-integritySCA.h
index 990987673ef..ba4b0ea99f7 100644
--- a/ace/config-integritySCA.h
+++ b/ace/config-integritySCA.h
@@ -24,9 +24,6 @@
 #define ACE_NEW_THROWS_EXCEPTIONS
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define	ACE_HAS_TEMPLATE_SPECIALIZATION
-#if 0
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-#endif
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS
 #define TAO_USE_SEQUENCE_TEMPLATES
@@ -34,7 +31,6 @@
 #define ACE_NEEDS_FUNC_DEFINITIONS
 #define _REENTRANT
 #define ACE_MT_SAFE 1
-#define __ACE_INLINE__
 
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
@@ -54,6 +50,9 @@
 
 
 /* SCA STUFF */
+#if defined(INTEGRITY_VERSION) && (INTEGRITY_VERSION >= 40108)
+#define ACE_HAS_SIG_ATOMIC_T
+#endif /* INTEGRITY_VERSION */
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGACTION
 #define ACE_HAS_SIGINFO_T
@@ -90,9 +89,6 @@
 #define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MKTEMP
 #define ACE_LACKS_MKSTEMP
-#if 0
-#define ACE_LACKS_MMAP
-#endif
 #define ACE_LACKS_MPROTECT
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_PIPE
@@ -100,32 +96,14 @@
 #define ACE_LACKS_RECVMSG
 #define ACE_LACKS_RWLOCK_T
 #define ACE_LACKS_SEMBUF_T
-#if 0
-#define ACE_LACKS_SOCKETPAIR
-#endif
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 #define ACE_LACKS_USER
-#if 0
-#define ACE_LACKS_STAT
-#endif
 #define ACE_LACKS_FILE_FCNTL
 #define ACE_LACKS_FCNTL
-#if 0
-#define ACE_LACKS_DIRECTORY_FUNCTIONS
-#define ACE_LACKS_UNLINK
-#endif
 #define ACE_LACKS_UMASK
-#if 0
-#define ACE_LACKS_CREAT
-#define ACE_LACKS_TRUNCATE
-#define ACE_LACKS_DUP
-#endif
 #define ACE_LACKS_SEEK
 #define ACE_LACKS_SHARED_MEMORY
 #define ACE_LACKS_MSYNC
-#if 0
-#define ACE_LACKS_SIGNALS
-#endif
 #define ACE_LACKS_PID_STUFF
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 #define ACE_LACKS_IPC_H
@@ -139,10 +117,6 @@
 #define ACE_LACKS_TRUNCATE
 #define ACE_LACKS_PWD_FUNCTIONS
 #define ACE_LACKS_UNIX_SIGNALS
-#if 0
-#define ACE_LACKS_ACCESS
-#define ACE_LACKS_UNAME
-#endif
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_LACKS_SYSV_SHMEM
 #define ACE_LACKS_PUTENV
@@ -150,29 +124,36 @@
 #define ACE_HAS_CLOCK_GETTIME
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_SETSCHED
-/* #define ACE_LACKS_SYS_NERR */
-#if 0
-#define ACE_LACKS_PTHREAD_CANCEL
-#define ACE_LACKS_PTHREAD_KILL
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_PTHREAD_CLEANUP
-#endif
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_WRITEV
 #define ACE_LACKS_READV
 /* below refers to fcntl style locking */
 #define ACE_LACKS_FILELOCKS
 
+#define ACE_LACKS_REALPATH
+#define ACE_HAS_CONST_CHAR_SWAB
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
 /***** Not tied to standards AFAIK ****/
 #define ACE_LACKS_MADVISE /* paging optimization not needed with INTEGRITY */
 #define ACE_LACKS_MALLOC_H /* netbsd's just includes stdlib.h */
 #define ACE_LACKS_MEMORY_H /* netbsd's just includes string.h */
+#define ACE_LACKS_INTTYPES_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_SYS_WAIT_H
+#define ACE_LACKS_SEARCH_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_PWD_H
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_REGEX_H
+#define ACE_LACKS_POLL_H
+#define ACE_LACKS_SYS_SHM_H
+#define ACE_LACKS_TERMIOS_H
 
 /***** STUFF INTEGRITY 4.0.8 APPEARS TO SUPPORT ****/
 /* note, possibly untested with ace */
-#if 0
-#define ACE_LACKS_GETSERVBYNAME
-#endif
 
 /***** TAO STUFF ****/
 #define TAO_USE_DOTTED_DECIMAL_ADDRESSES 1
@@ -188,25 +169,6 @@ extern "C"
   inline int isatty(int) { return 0; }
 }
 
-#if 0
-struct stat
-{
-  unsigned int st_atime; // time of last access
-  unsigned int st_mtime; // time of last data modification
-  unsigned int st_size;           // file size, in bytes
-  unsigned int st_mode;
-  unsigned int st_nlink;
-};
-
-#define MAXNAMLEN 1024
-#define S_IRUSR 1
-#define S_IRGRP 2
-#define S_IROTH 4
-#define S_IWUSR 8
-#define S_IWGRP 16
-#define S_IWOTH 32
-#endif
-
 #ifdef ppc
 #define ACE_HAS_POWERPC_TIMER
 #endif
@@ -221,25 +183,11 @@ typedef union sigval sigval_t;
 #define NSIG (SIGRTMAX+1)
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #define ACE_USE_RCSID 0
-#if 0
-typedef int mode_t;
-typedef int gid_t;
-typedef int uid_t;
-#endif
 #define ACE_LACKS_CUSERID
-#if 0
-#define ACE_LACKS_FSYNC
-#define ACE_LACKS_CHDIR
-#define ACE_LACKS_LSTAT
-#endif
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x20000
-// #include <stdio.h>
+#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x5000
 #define fileno(file)	((file)->io_channel) //Hack to get Svc_Conf_l.cpp compiled
 #define ACE_DEFAULT_THREAD_PRIORITY 127
 #define ACE_HAS_ATTR_SETSCHED
-#if 0
-#define ACE_LACKS_INHERIT_SCHED
-#endif
 #define PRI_FIFO_MIN 1
 #define PRI_FIFO_MAX 127
 #define ACE_THR_PRI_FIFO_DEF 127
@@ -259,16 +207,17 @@ int unlink(const char *);
 }
 
 #define ACE_LACKS_SETSID
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY /* TZ is ignored */
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_LACKS_UNIX_SYSLOG
 #define ACE_LACKS_TELLDIR
 #define ACE_LACKS_SEEKDIR
-#if 0
-#define ACE_LACKS_REWINDDIR
-#endif
 #define ACE_LACKS_GETHOSTENT
 
 
 /* end MIKEC Addtions */
 
+// Hack to avoid ensure that things defined in ind_io.h
+// have the right linkage
+#include <unistd.h>
+
 #endif /* ACE_CONFIG_H */
diff --git a/include/makeinclude/platform_integrity_ghs.GNU b/include/makeinclude/platform_integrity_ghs.GNU
index 98cb026b358..ffd50a45410 100644
--- a/include/makeinclude/platform_integrity_ghs.GNU
+++ b/include/makeinclude/platform_integrity_ghs.GNU
@@ -36,6 +36,27 @@ ifndef BSP
   BSP = mcp750
 endif
 
+ifndef TARGET_BSP
+  TARGET_BSP = $(ACE_ROOT)/tests/ACE.bsp
+endif
+
+ifndef TARGET_LD
+  TARGET_LD = $(ACE_ROOT)/tests/INTEGRITY.ld
+endif
+
+#### Set Integrity version
+verline := $(shell ($(GHSROOT)/gversion 2>&1|grep "Green Hills Software"))
+ifeq "$(verline)" ""
+  $(error Not Green Hills or the environment is not set-up)
+endif
+INTEGRITY_VERSION_STR := $(strip $(if ifeq $(word 4, $(verline)) "INTEGRITY", $(word 5, $(verline))))
+ifeq "$(INTEGRITY_VERSION_STR)" ""
+  $(error This Green Hills setup is not for Integrity)
+endif
+ifeq "$(INTEGRITY_VERSION_STR)" "4.1.8"
+  CCFLAGS += -DINTEGRITY_VERSION=40108
+endif
+
 CC = $(GHSROOT)/cc$(CPU)
 CXX = $(GHSROOT)/cx$(CPU)
 
@@ -46,15 +67,12 @@ ifeq (1, $(exceptions))
    override rtti = 1
 endif # exceptions
 
-CCFLAGS  += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(ACE_ROOT)/tests/ACE.bsp $(ACE_ROOT)/tests/INTEGRITY.ld
+CCFLAGS  += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(TARGET_BSP) $(TARGET_LD)
 DCFLAGS  += -G
 SOFLAGS  += -shared
 DLD      = $(CXX)
 LD       = $(CXX)
-LDLIBS += -lACE -lshm_client -lnet -livfssca -lposixsca -lsocket
-LDFLAGS = -lACE -lshm_client -lnet -livfssca -lposixsca -lsocket
-#LDFLAGS  = --no_auto_instantiation
-#OCFLAGS  += -OL -OM
+LIBS    += -lshm_client -lnet -livfssca -lposixsca -lsocket
 PIC      =
 AR := $(CXX) -archive $(IOPS)
 ARFLAGS = -o