diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-11-18 02:48:18 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-11-18 02:48:18 +0000 |
| commit | 2491a59b40d0eb77a500c75dc45a2a663e10d344 (patch) | |
| tree | d44f856d9ec8f3f3330ca4ee933f604aed4d700b | |
| parent | 9d377f1226d234bdcbec9133f7eabf18e54d9e4b (diff) | |
| download | nspr-hg-2491a59b40d0eb77a500c75dc45a2a663e10d344.tar.gz | |
Bugzilla bug #5358: fixed build problem on Solaris/x86 under gcc by
removing the #ifdef stuff from os_SunOS_x86.s.
Modified files: pr/src/md/unix/Makefile,Makefile.in,objs.mk,os_SunOS_x86.s
| -rw-r--r-- | pr/src/md/unix/Makefile | 22 | ||||
| -rw-r--r-- | pr/src/md/unix/Makefile.in | 22 | ||||
| -rw-r--r-- | pr/src/md/unix/objs.mk | 14 | ||||
| -rw-r--r-- | pr/src/md/unix/os_SunOS_x86.s | 3 |
4 files changed, 29 insertions, 32 deletions
diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile index cfbed71a..7e9b5185 100644 --- a/pr/src/md/unix/Makefile +++ b/pr/src/md/unix/Makefile @@ -223,17 +223,17 @@ ifeq ($(OS_ARCH), AIX) endif ifeq ($(OS_ARCH),SunOS) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_$(OS_ARCH)_x86.s - else - ifneq ($(OS_RELEASE),4.1.3_U1) - ifneq ($(LOCAL_THREADS_ONLY),1) - ASFILES = os_$(OS_ARCH).s - ifneq ($(USE_64),1) - ASFILES += os_$(OS_ARCH)_32.s - endif - endif - endif + ifneq ($(OS_RELEASE),4.1.3_U1) + ifneq ($(LOCAL_THREADS_ONLY),1) + ifeq ($(CPU_ARCH),x86) + ASFILES = os_$(OS_ARCH)_x86.s + else + ASFILES = os_$(OS_ARCH).s + ifneq ($(USE_64),1) + ASFILES += os_$(OS_ARCH)_32.s + endif + endif + endif endif endif diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index 1b75bfbd..666ce7ff 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -238,17 +238,17 @@ ifeq ($(OS_ARCH), AIX) endif ifeq ($(OS_ARCH),SunOS) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_$(OS_ARCH)_x86.s - else - ifneq ($(OS_RELEASE),4.1.3_U1) - ifneq ($(LOCAL_THREADS_ONLY),1) - ASFILES = os_$(OS_ARCH).s - ifneq ($(USE_64),1) - ASFILES += os_$(OS_ARCH)_32.s - endif - endif - endif + ifneq ($(OS_RELEASE),4.1.3_U1) + ifneq ($(LOCAL_THREADS_ONLY),1) + ifeq ($(CPU_ARCH),x86) + ASFILES = os_$(OS_ARCH)_x86.s + else + ASFILES = os_$(OS_ARCH).s + ifneq ($(USE_64),1) + ASFILES += os_$(OS_ARCH)_32.s + endif + endif + endif endif endif diff --git a/pr/src/md/unix/objs.mk b/pr/src/md/unix/objs.mk index f4d1326e..ce23756e 100644 --- a/pr/src/md/unix/objs.mk +++ b/pr/src/md/unix/objs.mk @@ -221,17 +221,17 @@ ifeq ($(OS_ARCH), AIX) endif ifeq ($(OS_ARCH),SunOS) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_$(OS_ARCH)_x86.s - else - ifneq ($(OS_RELEASE),4.1.3_U1) - ifneq ($(LOCAL_THREADS_ONLY),1) + ifneq ($(OS_RELEASE),4.1.3_U1) + ifneq ($(LOCAL_THREADS_ONLY),1) + ifeq ($(CPU_ARCH),x86) + ASFILES = os_$(OS_ARCH)_x86.s + else ASFILES = os_$(OS_ARCH).s ifneq ($(USE_64),1) ASFILES += os_$(OS_ARCH)_32.s endif - endif - endif + endif + endif endif endif diff --git a/pr/src/md/unix/os_SunOS_x86.s b/pr/src/md/unix/os_SunOS_x86.s index 3bfd3251..08bc38bb 100644 --- a/pr/src/md/unix/os_SunOS_x86.s +++ b/pr/src/md/unix/os_SunOS_x86.s @@ -59,7 +59,6 @@ sol_curthread: movl %ecx, %eax ret -#ifdef _PR_HAVE_ATOMIC_CAS / / PR_StackPush(listp, elementp) / @@ -137,5 +136,3 @@ empty: / Return previous listp value (already in eax) ret - -#endif / _PR_HAVE_ATOMIC_CAS |