diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-31 13:22:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-31 13:22:37 +0000 |
| commit | dbe4509ff0aade79be837e4540c1c24f2aa1554f (patch) | |
| tree | 25d0830faa56696fbf6ec4e1f9a14743f33edc92 | |
| parent | 7a121165b4cc6e6bc4f27b2a2d944dbe033c2337 (diff) | |
| download | ATCD-dbe4509ff0aade79be837e4540c1c24f2aa1554f.tar.gz | |
Wed Jan 31 13:21:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_hpux_aCC.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_hpux_gcc.GNU | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 64f9137977d..c90bd463b55 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 31 13:21:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_hpux_gcc.GNU: + Added improvement for GCC on HPUX IA64 + Wed Jan 31 10:17:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_hpux_gcc.GNU: diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index 83dce0bb58a..4f74585568b 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -166,7 +166,7 @@ endif ifeq ($(itanium),1) SOEXT = so else - SOEXT = sl + SOEXT = sl endif ifeq ($(buildbits),32) diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU index e63afecf2dd..bf7c5207448 100644 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ b/ACE/include/makeinclude/platform_hpux_gcc.GNU @@ -35,6 +35,10 @@ ifeq ($(threads),1) endif endif +ifeq ($(HPMODEL), ia64) + itanium = 1 +endif + # On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and # sys/pthread.h - both define the function, but slightly differently. # -fstrict-prototype resolves the issue. @@ -52,12 +56,13 @@ ARFLAGS = ruv RANLIB = echo LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E -SOEXT = sl SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $< PRELIB = @true -ifeq ($(HPMODEL), ia64) - itanium = 1 +ifeq ($(itanium),1) + SOEXT = so +else + SOEXT = sl endif ifeq ($(itanium),1) |