diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
| commit | aae3eb9256affb18cff589b52ee26e0a4e557bbd (patch) | |
| tree | 003711a54e7dfbde0b50979e2942fd3e0d3451c8 /libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch | |
| parent | ef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff) | |
| parent | 2864786ad884369ab5397be864e9f43d32bc2726 (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
Makefile.in
extra/Configs/Config.in
libc/sysdeps/linux/common/bits/kernel-features.h
libc/sysdeps/linux/common/poll.c
libc/sysdeps/linux/common/sysdep.h
libc/sysdeps/linux/sh/sysdep.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch')
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch index ce00f4d8e..ddb56645c 100644 --- a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch +++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch @@ -17,7 +17,7 @@ libpthread-so-y+=$(libpthread_ARCH_OBJ:.o=.os) libpthread-multi-y+=$(libpthread_ARCH_SRC) -objclean-y+=libpthread_arch_clean +objclean-y += CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT)) # We need to build as SHcompact for tas.. $(libpthread_ARCH_OBJ): %.o : %.c @@ -26,5 +26,5 @@ $(libpthread_ARCH_OBJ): %.o : %.c $(libpthread_ARCH_OBJ:.o=.os): %.os : %.c $(compile.c:32media=compact) -libpthread_arch_clean: +CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT)): $(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os) |