2010-07-15 21:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL
    ! vxWorks casing.
    + Added vxworks/gcc/arm example.

  * utils/hbmk2/hbmk2.prg
    % -DARMEL no more defined for vxworks/gcc/arm. It turns
      out it's a predefined macro.

  * config/global.mk
    ! Fixed HB_CPU autodetection after prev change.

  * INSTALL
    ; NOTE: After previous change HB_CCPOSTINST is automatically
            set on vxworks/gcc.

  * config/vxworks/libs.mk
  * config/vxworks/gcc.mk
    + Tried to enable dynlibhb, didn't succeed, see comments.

  * config/vxworks/gcc.mk
    % Deleted unnecessary compile time macros.

  ; TOFIX: vxworks HB_BUILD_SHARED=yes is broken. harbour .so
           is not found. Couldn't find out why.
  ; TOFIX: vxworks/gcc/arm hbatomic.h needs support added.
           arm harbour and hbpp builds fine.

harbour/ChangeLog

@@ -16,6 +16,34 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-15 21:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    ! vxWorks casing.
+    + Added vxworks/gcc/arm example.
+
+  * utils/hbmk2/hbmk2.prg
+    % -DARMEL no more defined for vxworks/gcc/arm. It turns
+      out it's a predefined macro.
+
+  * config/global.mk
+    ! Fixed HB_CPU autodetection after prev change.
+
+  * INSTALL
+    ; NOTE: After previous change HB_CCPOSTINST is automatically
+            set on vxworks/gcc.
+
+  * config/vxworks/libs.mk
+  * config/vxworks/gcc.mk
+    + Tried to enable dynlibhb, didn't succeed, see comments.
+
+  * config/vxworks/gcc.mk
+    % Deleted unnecessary compile time macros.
+
+  ; TOFIX: vxworks HB_BUILD_SHARED=yes is broken. harbour .so
+           is not found. Couldn't find out why.
+  ; TOFIX: vxworks/gcc/arm hbatomic.h needs support added.
+           arm harbour and hbpp builds fine.
+
 2010-07-15 20:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added experimental -cpu option. (not at the level

harbour/INSTALL

@@ -475,7 +475,7 @@ HARBOUR
    hpux     - HP-UX
    sunos    - Sun Solaris / OpenSolaris
    qnx      - QNX
-   vxworks  - VxWorks
+   vxworks  - vxWorks
    win      - MS Windows (all flavors)
               (see LINKS section for Win9x requirements)
    wce      - MS Windows CE
@@ -929,10 +929,16 @@ HARBOUR
       win-make
       ---
 
-      --- VxWorks 6.8 (requires preceding build for Windows target)
+      --- vxWorks 6.8 x86 (requires preceding build for Windows target)
       wrenv -p vxworks-6.8
       set HB_COMPILER=gcc
-      set HB_CCPOSTFIX=pentium
+      win-make
+      ---
+
+      --- vxWorks 6.8 ARM (requires preceding build for Windows target)
+      wrenv -p vxworks-6.8
+      set HB_COMPILER=gcc
+      set HB_CPU=arm
       win-make
       ---
 

harbour/config/global.mk

@@ -556,8 +556,6 @@ ifeq ($(HB_PLATFORM),)
    endif
 endif
 
-HB_CPU :=
-
 HB_COMP_AUTO :=
 HB_COMP_PATH :=
 ifeq ($(HB_COMPILER),)

harbour/config/vxworks/gcc.mk

@@ -17,13 +17,11 @@ LIB_EXT := .a
 HB_DYN_COPT := -DHB_DYNLIB -fpic
 
 ifeq ($(HB_CPU),x86)
-   CFLAGS += -D_VX_CPU=_VX_SIMPENTIUM
    ifeq ($(HB_CCPOSTFIX),)
       export HB_CCPOSTFIX := pentium
    endif
 else
 ifeq ($(HB_CPU),arm)
-   CFLAGS += -DARMEL -D_VX_ARMARCH7
    ifeq ($(HB_CCPOSTFIX),)
       export HB_CCPOSTFIX := arm
    endif
@@ -64,7 +62,7 @@ LD_OUT := -o
 LDLIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS_BIN),-L$(dir))
 DLIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS_DYN),-L$(dir))
 
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS_BIN),-l$(lib))
 
 LDFLAGS += $(LDLIBPATHS)
 
@@ -74,7 +72,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(
 DY := $(CC)
 DFLAGS += -shared $(DLIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS_DYN),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dynlib_object

harbour/config/vxworks/libs.mk

@@ -13,3 +13,9 @@ ifeq ($(HB_CPU),arm)
    SYSLIBPATHS_DYN := $(WIND_BASE)/target/lib/usr/lib/arm/ARMARCH7/common/PIC
 endif
 endif
+
+# For <dlfcn.h> support. I couldn't make it work though.
+# The lib is missing from PIC dir, so it can only work
+# for static targets, but even then, various tls symbols
+# are missing.
+#SYSLIBS_BIN += dl

harbour/utils/hbmk2/hbmk2.prg

@@ -2755,9 +2755,6 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTC ], "-D_HAS_C9X" )
             AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToSelf( GetEnv( "WIND_USR" ) + "/h" ) )
             AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToSelf( GetEnv( "WIND_USR" ) + "/h/wrn/coreip" ) )
-            IF hbmk[ _HBMK_cCPU ] == "arm"
-               AAdd( hbmk[ _HBMK_aOPTC ], "-DARMEL" )
-            ENDIF
             SWITCH hbmk[ _HBMK_cCPU ]
             CASE "x86" ; tmp := "simpentium/SIMPENTIUM" ; EXIT
             CASE "arm" ; tmp := "arm/ARMARCH7" ; EXIT