Changeset 18574

Show
Ignore:
Timestamp:
04/12/06 09:55:50 (3 years ago)
Author:
patrick
Message:

Merge the Doozer++ 2.0.2 snapshot from April 12, 2006, into the main
branch. This brings in a change needed for mutli-ABI handling between
i386 and x86_64.

NOTE: I had to do the merge in a somewhat atypical manner because the

Doozer++ import tags from the CVS repository did not seem to make
it into the Subversion repository.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/trunk/Doozer++/config/abi.m4

    r17587 r18574  
    2929dnl ----------------------------------------------------------------- 
    3030dnl File:          abi.m4,v 
    31 dnl Date modified: 2005/06/03 13:57:58 
    32 dnl Version:       1.18 
     31dnl Date modified: 2006/04/12 14:24:45 
     32dnl Version:       1.19 
    3333dnl ----------------------------------------------------------------- 
    3434dnl ************** <auto-copyright.pl END do not edit this line> ************** 
     
    7575dnl =========================================================================== 
    7676 
    77 dnl abi.m4,v 1.18 2005/06/03 13:57:58 patrickh Exp 
     77dnl abi.m4,v 1.19 2006/04/12 14:24:45 patrickh Exp 
    7878 
    7979dnl --------------------------------------------------------------------------- 
     
    152152         ;; 
    153153      xELF_i386) 
    154          DPP_ABI_CFG('ELF', 'i386'
     154         DPP_ABI_CFG('ELF', 'i386', '', '-m32'
    155155         ;; 
    156156      xELF_x86_64) 
    157          DPP_ABI_CFG('ELF', 'x86_64', '64'
     157         DPP_ABI_CFG('ELF', 'x86_64', '64', '-m64'
    158158         ;; 
    159159      xWIN32_i386)