Both. Glamorgan is used more widely today. I think Glamorganshire was used much more of the past.
* The names of these counties were generally formed from the names of the most populous market towns in the relevant areas, with the addition of the English "shire" (from the Anglo Saxon "scir" or "scire", a province).
The old county of Glamorganshire lost its south-eastern portion to the new County Borough of Newport and the remainder has been divided up into to new the administrative districts of Swansea, Neath Port Talbot, Bridgend, Glamorgan (District), Rhondda-Cynon-Taff, Merthyr Tydfil, Blaenau Gwent, Caerphilly and the City of Cardiff.
Cas