Numerical simulations of soft-core frictionless disks in two dimensions are carried out to study the behavior of a simple liquid as a function of temperature T, packing fraction phi, and uniform applied shear strain rate (gamma) over dot. Inferring the hard-core limit from our soft-core results, we find that it depends on the two parameters phi and T/(gamma) over dot. Here T/(gamma) over dot -> 0 defines the athermal limit in which a shear-driven jamming transition occurs at a well defined phi(J) and T/(gamma) over dot -> infinity defines the thermalized limit where an equilibrium glass transition may take place at phi(G). This conclusion argues that athermal jamming and equilibrium glassy behavior are not controlled by the same critical point. Preliminary results suggest phi(G) < phi(J).