Index: configure
===================================================================
RCS file: /cvsroot/pgsql-server/configure,v
retrieving revision 1.276
diff -c -c -r1.276 configure
*** configure	23 Jun 2003 23:51:57 -0000	1.276
--- configure	18 Jul 2003 16:59:44 -0000
***************
*** 2401,2406 ****
--- 2401,2415 ----
  if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
    CFLAGS="$CFLAGS -g"
  fi
+ 
+ /* Compile AMD Opteron using gcc in 64-bit mode */
+ if test "$GCC" = yes; then
+ case $host in
+   ia64-*)  CFLAGS="$CFLAGS -m64"
+            LDFLAGS="$LDFLAGS -melf_x86_64";;
+ esac
+ fi
+ 
  { echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
  echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
  
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql-server/configure.in,v
retrieving revision 1.267
diff -c -c -r1.267 configure.in
*** configure.in	23 Jun 2003 23:51:59 -0000	1.267
--- configure.in	18 Jul 2003 16:59:46 -0000
***************
*** 241,246 ****
--- 241,255 ----
  if test "$enable_debug" = yes && test "$ac_cv_prog_cc_g" = yes; then
    CFLAGS="$CFLAGS -g"
  fi
+ 
+ /* Compile AMD Opteron using gcc in 64-bit mode */
+ if test "$GCC" = yes; then
+ case $host in
+   ia64-*)  CFLAGS="$CFLAGS -m64"
+            LDFLAGS="$LDFLAGS -melf_x86_64";;
+ esac
+ fi
+ 
  AC_MSG_NOTICE([using CFLAGS=$CFLAGS])
  
  # Check if the compiler still works with the template settings
Index: src/include/storage/s_lock.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/storage/s_lock.h,v
retrieving revision 1.109
diff -c -c -r1.109 s_lock.h
*** src/include/storage/s_lock.h	24 Jun 2003 23:20:08 -0000	1.109
--- src/include/storage/s_lock.h	18 Jul 2003 16:59:48 -0000
***************
*** 94,100 ****
   */
  
  
! #if defined(__i386__) || defined(__x86_64__) 
  #define TAS(lock) tas(lock)
  
  static __inline__ int
--- 94,100 ----
   */
  
  
! #if defined(__i386__) || defined(__x86_64__) /* Intel Itanium */
  #define TAS(lock) tas(lock)
  
  static __inline__ int
***************
*** 113,118 ****
--- 113,119 ----
  #endif	 /* __i386__ || __x86_64__ */
  
  
+ /* AMD Opteron */
  #ifdef __ia64__
  #define TAS(lock) tas(lock)