diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:08:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:08:07 -0700 |
| commit | ce71c1f3398a956b0152f8ebf11b7a9d50a3095e (patch) | |
| tree | 67e956e549c2f7726b75b15ba96e9fe47a1bb633 | |
| parent | c1777a297043a06d6c18d383d17447f5eefcdcbe (diff) | |
| parent | bfb0e6fcd2826a869383b766712131a07a8059b0 (diff) | |
| download | git-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.tar.gz | |
Merge branch 'dm/port2zos'
z/OS port
* dm/port2zos:
compat/bswap.h: detect endianness from XL C compiler macros
Makefile: reorder linker flags in the git executable rule
git-compat-util.h: support variadic macros with the XL C compiler
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | compat/bswap.h | 4 | ||||
| -rw-r--r-- | git-compat-util.h | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1610,8 +1610,8 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_INFO_PATH="$(infodir_relative_SQ)"' git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) - $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ - $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \ + $(BUILTIN_OBJS) $(LIBS) help.sp help.s help.o: common-cmds.h diff --git a/compat/bswap.h b/compat/bswap.h index f6fd9a6a6c..7fed637ed0 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -122,6 +122,10 @@ static inline uint64_t git_bswap64(uint64_t x) # define GIT_BYTE_ORDER GIT_BIG_ENDIAN # elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) # define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN +# elif defined(__THW_BIG_ENDIAN__) && !defined(__THW_LITTLE_ENDIAN__) +# define GIT_BYTE_ORDER GIT_BIG_ENDIAN +# elif defined(__THW_LITTLE_ENDIAN__) && !defined(__THW_BIG_ENDIAN__) +# define GIT_BYTE_ORDER GIT_LITTLE_ENDIAN # else # error "Cannot determine endianness" # endif diff --git a/git-compat-util.h b/git-compat-util.h index fc83339bd7..400e921086 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -778,7 +778,7 @@ void git_qsort(void *base, size_t nmemb, size_t size, #endif #endif -#if defined(__GNUC__) || (_MSC_VER >= 1400) +#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__C99_MACRO_WITH_VA_ARGS) #define HAVE_VARIADIC_MACROS 1 #endif |