Skip to content

Commit 75577f9

Browse files
authored
Merge pull request #33 from xianyi/develop
rebase
2 parents 276c179 + 33d92c7 commit 75577f9

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

Makefile.system

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,7 @@ export OSNAME
13281328
export ARCH
13291329
export CORE
13301330
export LIBCORE
1331+
export __BYTE_ORDER__
13311332
export PGCPATH
13321333
export CONFIG
13331334
export CC

getarch.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,13 @@ int main(int argc, char *argv[]){
12981298
#endif
12991299
#endif
13001300

1301+
#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1302+
printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n");
1303+
#endif
1304+
#if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ > 0
1305+
printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n");
1306+
#endif
1307+
13011308
#ifdef MAKE_NB_JOBS
13021309
#if MAKE_NB_JOBS > 0
13031310
printf("MAKE += -j %d\n", MAKE_NB_JOBS);

kernel/power/KERNEL.POWER8

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c
9292
ISMINKERNEL = imin.S
9393
ISMAXKERNEL = imax.S
9494

95-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
95+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
9696
ifneq ($(GCCVERSIONGTEQ9),1)
9797
ISAMAXKERNEL = isamax_power8.S
9898
else
@@ -104,7 +104,7 @@ endif
104104
#
105105
IDAMAXKERNEL = idamax.c
106106
#
107-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
107+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
108108
ifneq ($(GCCVERSIONGTEQ9),1)
109109
ICAMAXKERNEL = icamax_power8.S
110110
else
@@ -116,7 +116,7 @@ endif
116116
#
117117
IZAMAXKERNEL = izamax.c
118118
#
119-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
119+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
120120
ifneq ($(GCCVERSIONGTEQ9),1)
121121
ISAMINKERNEL = isamin_power8.S
122122
else
@@ -128,7 +128,7 @@ endif
128128
#
129129
IDAMINKERNEL = idamin.c
130130
#
131-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
131+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
132132
ifneq ($(GCCVERSIONGTEQ9),1)
133133
ICAMINKERNEL = icamin_power8.S
134134
else
@@ -153,7 +153,7 @@ ZASUMKERNEL = zasum.c
153153
#
154154
SAXPYKERNEL = saxpy.c
155155
DAXPYKERNEL = daxpy.c
156-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
156+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
157157
ifneq ($(GCCVERSIONGTEQ9),1)
158158
CAXPYKERNEL = caxpy_power8.S
159159
else

kernel/power/KERNEL.PPC440

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ZASUMKERNEL = zasum_ppc440.S
1515

1616
SAXPYKERNEL = axpy_ppc440.S
1717
DAXPYKERNEL = axpy_ppc440.S
18-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
18+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
1919
CAXPYKERNEL = ../arm/zaxpy.c
2020
ZAXPYKERNEL = ../arm/zaxpy.c
2121
else
@@ -25,7 +25,7 @@ endif
2525

2626
SDOTKERNEL = dot_ppc440.S
2727
DDOTKERNEL = dot_ppc440.S
28-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
28+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
2929
CDOTKERNEL = zdot_ppc440.S
3030
ZDOTKERNEL = zdot_ppc440.S
3131
else
@@ -62,7 +62,7 @@ ZNRM2KERNEL = znrm2_ppc440.S
6262

6363
SROTKERNEL = rot_ppc440.S
6464
DROTKERNEL = rot_ppc440.S
65-
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
65+
ifneq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
6666
CROTKERNEL = zrot_ppc440.S
6767
ZROTKERNEL = zrot_ppc440.S
6868
else
@@ -132,7 +132,7 @@ ZTRSMKERNEL_LT = ztrsm_kernel_ppc440_LT.S
132132
ZTRSMKERNEL_RN = ztrsm_kernel_ppc440_LT.S
133133
ZTRSMKERNEL_RT = ztrsm_kernel_ppc440_RT.S
134134

135-
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
135+
ifeq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
136136
SGEMVNKERNEL = ../arm/gemv_n.c
137137
DGEMVNKERNEL = ../arm/gemv_n.c
138138
SGEMVTKERNEL = ../arm/gemv_t.c

kernel/power/KERNEL.PPC970

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
1+
ifeq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
22
SGEMMKERNEL = gemm_kernel.S
33
SGEMMINCOPY =
44
SGEMMITCOPY =
@@ -30,7 +30,7 @@ DGEMMITCOPYOBJ =
3030
DGEMMONCOPYOBJ = dgemm_oncopy$(TSUFFIX).$(SUFFIX)
3131
DGEMMOTCOPYOBJ = dgemm_otcopy$(TSUFFIX).$(SUFFIX)
3232

33-
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
33+
ifeq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
3434
CGEMMKERNEL = zgemm_kernel.S
3535
CGEMMINCOPY =
3636
CGEMMITCOPY =
@@ -72,7 +72,7 @@ ZTRSMKERNEL_LT = ztrsm_kernel_LT.S
7272
ZTRSMKERNEL_RN = ztrsm_kernel_LT.S
7373
ZTRSMKERNEL_RT = ztrsm_kernel_RT.S
7474

75-
ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
75+
ifeq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
7676
STRSMKERNEL_LN = trsm_kernel_LN.S
7777
STRSMKERNEL_LT = trsm_kernel_LT.S
7878
STRSMKERNEL_RN = trsm_kernel_LT.S

0 commit comments

Comments
 (0)