changeset 778:0e1d1ff8c398

Merge
author kurt
date Mon, 18 May 2009 08:15:54 -0400
parents 66d9eca6d779 409efb956f93
children b90f9747cc5e
files make/bsd/makefiles/gcc.make
diffstat 2 files changed, 18 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/make/bsd/makefiles/defs.make	Mon May 18 08:14:54 2009 -0400
+++ b/make/bsd/makefiles/defs.make	Mon May 18 08:15:54 2009 -0400
@@ -69,8 +69,8 @@
   HS_ARCH            = sparc
 endif
 
-# x86_64
-ifeq ($(ARCH), x86_64) 
+# amd64
+ifeq ($(ARCH), amd64) 
   ifeq ($(ARCH_DATA_MODEL), 64)
     ARCH_DATA_MODEL = 64
     MAKE_ARGS       += LP64=1
@@ -82,42 +82,27 @@
     PLATFORM        = bsd-i586
     VM_PLATFORM     = bsd_i486
     HS_ARCH         = x86
-    # We have to reset ARCH to i686 since SRCARCH relies on it
-    ARCH            = i686   
+    # We have to reset ARCH to i386 since SRCARCH relies on it
+    ARCH            = i386   
   endif
 endif
 
-# amd64
-ifeq ($(ARCH), amd64)
-  ARCH_DATA_MODEL = 64
-  MAKE_ARGS       += LP64=1
-  PLATFORM        = bsd-amd64
-  VM_PLATFORM     = bsd_amd64
-  HS_ARCH         = x86
-endif
-
 # i386
 ifeq ($(ARCH), i386)
-  ARCH_DATA_MODEL  = 32
-  PLATFORM         = bsd-i586
-  VM_PLATFORM      = bsd_i486
-  HS_ARCH          = x86
-endif
-
-# i486
-ifeq ($(ARCH), i486)
-  ARCH_DATA_MODEL  = 32
-  PLATFORM         = bsd-i586
-  VM_PLATFORM      = bsd_i486
-  HS_ARCH          = x86
-endif
-
-# i686
-ifeq ($(ARCH), i686)
-  ARCH_DATA_MODEL  = 32
-  PLATFORM         = bsd-i586
-  VM_PLATFORM      = bsd_i486
-  HS_ARCH          = x86
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    ARCH_DATA_MODEL = 64
+    MAKE_ARGS       += LP64=1
+    PLATFORM        = bsd-amd64
+    VM_PLATFORM     = bsd_amd64
+    HS_ARCH         = x86
+    # We have to reset ARCH to amd64 since SRCARCH relies on it
+    ARCH            = amd64
+  else
+    ARCH_DATA_MODEL  = 32
+    PLATFORM         = bsd-i586
+    VM_PLATFORM      = bsd_i486
+    HS_ARCH          = x86
+  endif
 endif
 
 JDK_INCLUDE_SUBDIR=bsd
--- a/make/bsd/makefiles/gcc.make	Mon May 18 08:14:54 2009 -0400
+++ b/make/bsd/makefiles/gcc.make	Mon May 18 08:15:54 2009 -0400
@@ -72,9 +72,6 @@
 ifeq ($(OS_VENDOR), Darwin)
   # Ineffecient 16-byte stack re-alignment on Darwin/IA32
   ARCHFLAG/i486 += -mstackrealign
-
-  # -arch compiler flag required for x64_64
-  ARCHFLAGS/amd64 += -arch x86_64
 endif
 
 CFLAGS     += $(ARCHFLAG)