Mesa (master): Rename sparc/clip.S -> sparc/sparc_clip.S
Jon TURNEY
jturney at kemper.freedesktop.org
Fri Jul 13 11:58:50 UTC 2012
Module: Mesa
Branch: master
Commit: 8676890018a94b475dd0bb7389f3b77f37e36fdb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8676890018a94b475dd0bb7389f3b77f37e36fdb
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Sat Jul 7 00:53:31 2012 +0100
Rename sparc/clip.S -> sparc/sparc_clip.S
Automake can't handle having both clip.S and clip.c, even though they have different paths
"src/mesa/Makefile.am: object `clip.lo' created by `$(SRCDIR)/sparc/clip.S' and `$(SRCDIR)/main/clip.c'"
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Tested-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/SConscript | 2 +-
src/mesa/sources.mak | 2 +-
src/mesa/sparc/{clip.S => sparc_clip.S} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 819a0fd..906c579 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -430,7 +430,7 @@ if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
elif env['machine'] == 'sparc':
mesa_sources += [
'sparc/sparc.c',
- 'sparc/clip.S',
+ 'sparc/sparc_clip.S',
'sparc/norm.S',
'sparc/xform.S',
]
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 16b1c39..d22f059 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -307,7 +307,7 @@ X86_64_FILES = \
$(SRCDIR)/x86-64/xform4.S
SPARC_FILES = \
- $(SRCDIR)/sparc/clip.S \
+ $(SRCDIR)/sparc/sparc_clip.S \
$(SRCDIR)/sparc/norm.S \
$(SRCDIR)/sparc/xform.S
diff --git a/src/mesa/sparc/clip.S b/src/mesa/sparc/sparc_clip.S
similarity index 100%
rename from src/mesa/sparc/clip.S
rename to src/mesa/sparc/sparc_clip.S
More information about the mesa-commit
mailing list