ChangeLogTag:Thu Apr 12 20:36:30 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

8 files changed, 48 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index d141e7d072d..c9d07456afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 12 20:36:30 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i (thr_getspecific): Reorder the way in which we check
+	  the flags so that ACE_HAS_PTHREADS takes precedence over
+ 	  ACE_HAS_STHREADS.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
 Thu Apr 12 21:18:44 2001  Steve Huston  <shuston@riverace.com>
 
         * include/makeinclude/platform_hpux_aCC.GNU: Added
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index d141e7d072d..c9d07456afe 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Apr 12 20:36:30 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i (thr_getspecific): Reorder the way in which we check
+	  the flags so that ACE_HAS_PTHREADS takes precedence over
+ 	  ACE_HAS_STHREADS.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
 Thu Apr 12 21:18:44 2001  Steve Huston  <shuston@riverace.com>
 
         * include/makeinclude/platform_hpux_aCC.GNU: Added
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index d141e7d072d..c9d07456afe 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu Apr 12 20:36:30 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS.i (thr_getspecific): Reorder the way in which we check
+	  the flags so that ACE_HAS_PTHREADS takes precedence over
+ 	  ACE_HAS_STHREADS.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
 Thu Apr 12 21:18:44 2001  Steve Huston  <shuston@riverace.com>
 
         * include/makeinclude/platform_hpux_aCC.GNU: Added
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 543dc046ff8..3641cb5aa0c 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -55,7 +55,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <li>
 <a href="OBV.html">Object-by-Value</a></li>
 
-<li><a href="#CORBA2.3.1">CORBA 2.3.1 Conformance</a></li>
+<li><a href="#CORBA-conformance">CORBA Standards Conformance</a></li>
 
 </UL>
 </TD>
@@ -2221,9 +2221,10 @@ our short <a href="../LocalObject.html">guideline</a> on implementing
 local objects.</p>
 
 <HR><P>
-<h3><a NAME="CORBA2.3.1">CORBA 2.3.1 Conformance</a></h3>
-(updated 9 August 2000)<br>
-Here is a summary of TAO's conformance issues with CORBA 2.3.1:<br>
+<h3><a NAME="CORBA-conformance">CORBA Standards Conformance</a></h3>
+
+Here is a summary of TAO's conformance issues with CORBA latest CORBA
+specifications (updated 9 August 2000):<br>
 
 2.3.1 and 2.3 differ in very little, if at all, check:<br>
 <a href="ftp://ftp.omg.org/pub/docs/formal/99-10-07.pdf">ftp://ftp.omg.org/pub/docs/formal/99-10-07.pdf</a><br>
@@ -2233,9 +2234,6 @@ Here is a summary of TAO's conformance issues with CORBA 2.3.1:<br>
   <li>The full OBV (valueboxes, valuetypes in all sorts of things, value
    graphs, Anys and value types, abstract interfaces, etc. etc.)
 
-  <li>The old (2.3.1) IfR interface (we support a 3.0 draft, which is
-   non-backwards compatible, and it is going to be changed).
-
   <li>The IfR database cannot be populated (so it is less than fully
    operational ;-))
 
@@ -2249,8 +2247,6 @@ Here is a summary of TAO's conformance issues with CORBA 2.3.1:<br>
   <li>There are several "optional" features like bi-dir GIOP that we
    don't support yet.
 
-  <li>The old ServantManager interfaces (POA stuff)
-
   <li>Domain Managers (useful for security, but otherwise nobody seems to
    care)
 
diff --git a/THANKS b/THANKS
index 4df27bdb3f4..e2b9637d7c7 100644
--- a/THANKS
+++ b/THANKS
@@ -1085,7 +1085,7 @@ Wei Zheng <weizheng@uiuc.edu>
 Bernd Annamaier <bernd.annamaier@de.adtranz.com>
 Joachim Tremouroux <joachim.tremouroux@microresearch.be>
 Momchil Velikov <velco@fadata.bg>
-Munagala Ramanath <Munagala.Ramanath@postx.com>
+Munagala Ramanath <amberarrow@yahoo.com>
 Kevin Marhsall <KCMarshall@att.net>
 Adrian Mercieca <adrian@anvil.co.uk>
 David Channon <djc@uq.net.au>
diff --git a/ace/OS.i b/ace/OS.i
index e58a2e234df..f4b8b885151 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -7513,7 +7513,6 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio)
 #endif /* ACE_HAS_PACE */
 }
 
-
 #if defined (ACE_HAS_TSS_EMULATION)
 
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
@@ -7528,9 +7527,7 @@ ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
 //  return 0;
 //#  elif defined (ACE_HAS_THREADS)
 #  if defined (ACE_HAS_THREADS)
-#   if defined (ACE_HAS_STHREADS)
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), ace_result_), int, -1);
-#   elif defined (ACE_HAS_PTHREADS)
+#   if defined (ACE_HAS_PTHREADS)
 #    if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
     return pthread_getspecific (key, data);
 #    else /* this is ACE_HAS_PTHREADS_DRAFT7 or STD */
@@ -7542,6 +7539,8 @@ ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
 #     endif /* pthread_getspecific */
 #    endif       /*  ACE_HAS_PTHREADS_DRAFT4, 6 */
     return 0;
+#   elif defined (ACE_HAS_STHREADS)
+    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), ace_result_), int, -1);
 #   elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_TSS)
     ACE_hthread_t tid;
     ACE_OS::thr_self (tid);
diff --git a/include/makeinclude/Makefile.rtems b/include/makeinclude/Makefile.rtems
index e6273953e60..39a44334129 100644
--- a/include/makeinclude/Makefile.rtems
+++ b/include/makeinclude/Makefile.rtems
@@ -1,25 +1,31 @@
-#  Makefile
+# $id: Makefile $
 
+#export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/
 include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(PROJECT_ROOT)/make/leaf.cfg
 
+
 print_cxx:
-	@echo sparc-rtems-g++
+	@echo "$(CXX)"
 
 print_cc:
-	@echo sparc-rtems-gcc
+	@echo "$(CC_FOR_TARGET)"
 
 print_cflags:
-	@echo -B/opt/rtems/sparc-rtems/erc32/lib/ -specs bsp_specs -qrtems -mcpu=cypress 
+	@echo "$(GCCSPECS) $(CPU_CFLAGS)"
 
 print_prefix:
-	@echo /opt/rtems
+	@echo $(prefix)
 
 print_target:
-	@echo sparc-rtems
+	@echo $(NM_FOR_TARGET:%nm=%)
 
 is_big_endian:
 	t=`echo "#include <rtems.h>" | \
-	   sparc-rtems-gcc -B/opt/rtems/sparc-rtems/erc32/lib/ -specs bsp_specs -qrtems -mcpu=cypress -E -dM - | \
+	   $(CC_FOR_TARGET) $(GCCSPECS) $(CPU_CFLAGS) -E -dM - | \
 	   grep CPU_BIG_ENDIAN | cut -d' ' -f3` ; echo $$t
+
+rtems_init.o: rtems_init.c
+	$(CC_FOR_TARGET) $(GCCSPECS) $(CPU_CFLAGS) -c rtems_init.c
+
diff --git a/include/makeinclude/platform_rtems.x_g++.GNU b/include/makeinclude/platform_rtems.x_g++.GNU
index 3b1b36f07c4..df0b0515847 100644
--- a/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/include/makeinclude/platform_rtems.x_g++.GNU
@@ -37,16 +37,16 @@ endif # ! PERL_PATH
 #### BEGIN target CPU-specific settings
 
 # look them up
-CFLAGS = $(shell make -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags)
-#CCFLAGS = $(shell make -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags) -fno-implicit-templates
+CFLAGS = $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags)
+#CCFLAGS = $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags) -fno-implicit-templates
 CCFLAGS = -fno-implicit-templates
 
 #### END target CPU-specific settings
 
-CXX := $(shell make -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cxx)
+CXX := $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cxx)
 
 ifndef ACE_CC
-ACE_CC := $(shell make -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cc)
+ACE_CC := $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cc)
 endif # ! ACE_CC
 ifndef ACE_CC_VERSION
   ACE_CC_VERSION := $(shell $(ACE_CC) --version)
@@ -83,6 +83,7 @@ LDFLAGS         += #-Wl,-X -Wl,-r
 OCFLAGS         += -O
 PIC             =
 
+
 #### ld can't handle INCLDIRS, so override LINK definitions.
 LINK.c           = override
 LINK.c.override  = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS)