diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-14 04:52:50 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-14 04:52:50 +0000 |
| commit | 4fa417e71cead406f0fd7b34e2477dc5adca661b (patch) | |
| tree | ddc7126c2322f82cd126a43381c3ee35d266295f | |
| parent | 89a71fef8022549c9b25a1a137c0769bf9fa61c4 (diff) | |
| download | ATCD-4fa417e71cead406f0fd7b34e2477dc5adca661b.tar.gz | |
Fri Sep 14 04:51:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 13 | ||||
| -rw-r--r-- | ACE/ace/CDR_Base.inl | 6 | ||||
| -rw-r--r-- | ACE/ace/config-sunos5.5.h | 1 |
3 files changed, 15 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 531589f8f90..99175677897 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Fri Sep 14 04:51:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Base.{cpp.inl}: + Don't use ACE_HAS_INTEL_ASSEMBLY, but just add EM64T, fixes problems + with solaris and vxworks + + Revert this change, not needed + + Thu Sep 13 08:55:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/config-sunos5.5.h: + Don't use ACE_HAS_INTEL_ASSEMBLY with GCC + Thu Sep 13 15:49:45 UTC 2007 Dale Wilson <wilsond@ociweb.com> * NEWS: @@ -13,7 +25,6 @@ Thu Sep 13 15:34:15 UTC 2007 Dale Wilson <wilsond@ociweb.com> Move the check to see if _WIN32_WINNT is defined until *after* windows.h is included (directly or indirectly) - Thu Sep 13 15:17:28 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * ace/ATM_Stream.cpp: diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl index dd56d527144..fc991d41cd1 100644 --- a/ACE/ace/CDR_Base.inl +++ b/ACE/ace/CDR_Base.inl @@ -73,7 +73,7 @@ ACE_CDR::swap_2 (const char *orig, char* target) #elif defined (ACE_HAS_BSWAP_16) *reinterpret_cast<unsigned short *> (target) = bswap_16 (*reinterpret_cast<unsigned short const *> (orig)); -#elif defined(ACE_HAS_INTEL_ASSEMBLY) +#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) unsigned short a = *reinterpret_cast<const unsigned short*> (orig); asm( "rolw $8, %0" : "=r" (a) : "0" (a) ); @@ -104,7 +104,7 @@ ACE_CDR::swap_4 (const char* orig, char* target) #elif defined (ACE_HAS_BSWAP_32) *reinterpret_cast<unsigned int *> (target) = bswap_32 (*reinterpret_cast<unsigned int const *> (orig)); -#elif defined(ACE_HAS_INTEL_ASSEMBLY) +#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) // We have ACE_HAS_PENTIUM, so we know the sizeof's. register unsigned int j = *reinterpret_cast<const unsigned int*> (orig); @@ -136,7 +136,7 @@ ACE_CDR::swap_8 (const char* orig, char* target) #elif defined (ACE_HAS_BSWAP_64) *reinterpret_cast<unsigned long long *> (target) = bswap_64 (*reinterpret_cast<unsigned long long const *> (orig)); -#elif defined(ACE_HAS_INTEL_ASSEMBLY) +#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) register unsigned long x = * reinterpret_cast<const unsigned long*> (orig); asm ("bswapq %1" : "=r" (x) : "0" (x)); diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 6cf4bea942b..56fc7e9c0d8 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -118,7 +118,6 @@ // this must appear before its #include. # define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" -# undef ACE_HAS_INTEL_ASSEMBLY # define ACE_HAS_HI_RES_TIMER // Denotes that GNU has cstring.h as standard, to redefine memchr(). # define ACE_HAS_GNU_CSTRING_H |