Hi,

the attached patch uses define_c_enum for defining the unspec constant
as it recently has been changed for other targets as well.

Committed to mainline.

Bye,

-Andreas-


2011-03-18  Andreas Krebbel  <andreas.kreb...@de.ibm.com>

        * config/s390/s390.md: Use define_c_enum for the unspec constant
        definitions.

Index: gcc/config/s390/s390.md
===================================================================
*** gcc/config/s390/s390.md.orig
--- gcc/config/s390/s390.md
***************
*** 57,143 ****
  ;; UNSPEC usage
  ;;
  
! (define_constants
!   [; Miscellaneous
!    (UNSPEC_ROUND              1)
!    (UNSPEC_CCU_TO_INT         2)
!    (UNSPEC_CCZ_TO_INT         3)
!    (UNSPEC_ICM                        10)
!    (UNSPEC_TIE                  11)
  
     ; GOT/PLT and lt-relative accesses
!    (UNSPEC_LTREL_OFFSET               100)
!    (UNSPEC_LTREL_BASE         101)
!    (UNSPEC_POOL_OFFSET                102)
!    (UNSPEC_GOTENT             110)
!    (UNSPEC_GOT                        111)
!    (UNSPEC_GOTOFF             112)
!    (UNSPEC_PLT                        113)
!    (UNSPEC_PLTOFF             114)
  
     ; Literal pool
!    (UNSPEC_RELOAD_BASE                210)
!    (UNSPEC_MAIN_BASE          211)
!    (UNSPEC_LTREF              212)
!    (UNSPEC_INSN                       213)
!    (UNSPEC_EXECUTE            214)
  
     ; Atomic Support
!    (UNSPEC_MB                 400)
  
     ; TLS relocation specifiers
!    (UNSPEC_TLSGD              500)
!    (UNSPEC_TLSLDM             501)
!    (UNSPEC_NTPOFF               502)
!    (UNSPEC_DTPOFF               503)
!    (UNSPEC_GOTNTPOFF            504)
!    (UNSPEC_INDNTPOFF            505)
  
     ; TLS support
!    (UNSPEC_TLSLDM_NTPOFF      511)
!    (UNSPEC_TLS_LOAD           512)
  
     ; String Functions
!    (UNSPEC_SRST                       600)
!    (UNSPEC_MVST                       601)
  
     ; Stack Smashing Protector
!    (UNSPEC_SP_SET             700)
!    (UNSPEC_SP_TEST            701)
  
     ; Test Data Class (TDC)
!    (UNSPEC_TDC_INSN           800)
  
     ; Population Count
!    (UNSPEC_POPCNT               900)
!    (UNSPEC_COPYSIGN             901)
   ])
  
  ;;
  ;; UNSPEC_VOLATILE usage
  ;;
  
! (define_constants
!   [; Blockage
!    (UNSPECV_BLOCKAGE          0)
  
     ; TPF Support
!    (UNSPECV_TPF_PROLOGUE        20)
!    (UNSPECV_TPF_EPILOGUE        21)
  
     ; Literal pool
!    (UNSPECV_POOL              200)
!    (UNSPECV_POOL_SECTION      201)
!    (UNSPECV_POOL_ALIGN                202)
!    (UNSPECV_POOL_ENTRY                203)
!    (UNSPECV_MAIN_POOL         300)
  
     ; TLS support
!    (UNSPECV_SET_TP            500)
  
     ; Atomic Support
!    (UNSPECV_CAS                       700)
!    (UNSPECV_ATOMIC_OP           701)
    ])
  
  ;;
--- 57,143 ----
  ;; UNSPEC usage
  ;;
  
! (define_c_enum "unspec" [
!    ; Miscellaneous
!    UNSPEC_ROUND
!    UNSPEC_CCU_TO_INT
!    UNSPEC_CCZ_TO_INT
!    UNSPEC_ICM
!    UNSPEC_TIE
  
     ; GOT/PLT and lt-relative accesses
!    UNSPEC_LTREL_OFFSET
!    UNSPEC_LTREL_BASE
!    UNSPEC_POOL_OFFSET
!    UNSPEC_GOTENT
!    UNSPEC_GOT
!    UNSPEC_GOTOFF
!    UNSPEC_PLT
!    UNSPEC_PLTOFF
  
     ; Literal pool
!    UNSPEC_RELOAD_BASE
!    UNSPEC_MAIN_BASE
!    UNSPEC_LTREF
!    UNSPEC_INSN
!    UNSPEC_EXECUTE
  
     ; Atomic Support
!    UNSPEC_MB
  
     ; TLS relocation specifiers
!    UNSPEC_TLSGD
!    UNSPEC_TLSLDM
!    UNSPEC_NTPOFF
!    UNSPEC_DTPOFF
!    UNSPEC_GOTNTPOFF
!    UNSPEC_INDNTPOFF
  
     ; TLS support
!    UNSPEC_TLSLDM_NTPOFF
!    UNSPEC_TLS_LOAD
  
     ; String Functions
!    UNSPEC_SRST
!    UNSPEC_MVST
  
     ; Stack Smashing Protector
!    UNSPEC_SP_SET
!    UNSPEC_SP_TEST
  
     ; Test Data Class (TDC)
!    UNSPEC_TDC_INSN
  
     ; Population Count
!    UNSPEC_POPCNT
!    UNSPEC_COPYSIGN
   ])
  
  ;;
  ;; UNSPEC_VOLATILE usage
  ;;
  
! (define_c_enum "unspecv" [
!    ; Blockage
!    UNSPECV_BLOCKAGE
  
     ; TPF Support
!    UNSPECV_TPF_PROLOGUE
!    UNSPECV_TPF_EPILOGUE
  
     ; Literal pool
!    UNSPECV_POOL
!    UNSPECV_POOL_SECTION
!    UNSPECV_POOL_ALIGN
!    UNSPECV_POOL_ENTRY
!    UNSPECV_MAIN_POOL
  
     ; TLS support
!    UNSPECV_SET_TP
  
     ; Atomic Support
!    UNSPECV_CAS
!    UNSPECV_ATOMIC_OP
    ])
  
  ;;

Reply via email to