Eliminate custom typedefs in the FreeBSD case and include sys/types.h to define standard types. This is currently fixing a build failure on x86_64 FreeBSD.

[seanbruno]

Summary

Use o/s provided sys/types.h to bring in Profiling types.

[davidxl]

LGTM assuming it works as expected.

[davidxl]

Any blocker for this to be committed ?

[seanbruno]

In D15088#302991, @davidxl wrote:

Any blocker for this to be committed ?

No that I'm aware of.

[davidxl]

Re-examine the patch a little bit. Have you checked older FreeBSD system works with the patch? See the old comment in the code:

System headers define 'size_t' incorrectly on x64 FreeBSD (prior to

• FreeBSD 10, r232261) when compiled in 32-bit mode

PRIu64 macro also does not seem to be defined in sys/types.h but in inttypes.h

[dim]

In D15088#305416, @davidxl wrote:

Re-examine the patch a little bit. Have you checked older FreeBSD system works with the patch? See the old comment in the code:

System headers define 'size_t' incorrectly on x64 FreeBSD (prior to

• FreeBSD 10, r232261) when compiled in 32-bit mode

If I recall correctly, FreeBSD didn't properly support compiling in 32-bit mode on a 64-bit x86 platform anyway, before this commit. So maybe the issue is a little moot now. Also, no supported releases of FreeBSD have the old-style headers anymore.

On the other hand, we could also test __FreeBSD_version here. @emaste, what do you think about it? I believe >= 1000010 and and >= 902509 are the versions where the header is guaranteed to be correct.

PRIu64 macro also does not seem to be defined in sys/types.h but in inttypes.h

Yes, it is indeed defined there. Let's just include inttypes.h, then.

[davidxl]

Ok thanks. I will first commit a patch that includes inttypes.h and
sys/types.h for FreeBSD. If there is a need to support older
versionsof FreeBSD, we can add checks for FreeBSE version.

David

compiler-rt/trunk/lib/profile/InstrProfilingPort.h

 #define COMPILER_RT_BOOL_CMPXCHG(Ptr, OldV, NewV)                              \
   BoolCmpXchg((void **)Ptr, OldV, NewV)
 #endif
 
 #define PROF_ERR(Format, ...)                                                  \
   if (GetEnvHook && GetEnvHook("LLVM_PROFILE_VERBOSE_ERRORS"))                 \
     fprintf(stderr, Format, __VA_ARGS__);
 
-#if defined(__FreeBSD__) && defined(__i386__)
+#if defined(__FreeBSD__)
 
-/* System headers define 'size_t' incorrectly on x64 FreeBSD (prior to
- * FreeBSD 10, r232261) when compiled in 32-bit mode.
- */
-#define PRIu64 "llu"
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-typedef uint32_t uintptr_t;
-#elif defined(__FreeBSD__) && defined(__x86_64__)
-#define PRIu64 "lu"
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long int uintptr_t;
+#include <inttypes.h>
+#include <sys/types.h>
 
-#else /* defined(__FreeBSD__) && defined(__i386__) */
+#else /* defined(__FreeBSD__) */
 
 #include <inttypes.h>
 #include <stdint.h>
 
 #endif /* defined(__FreeBSD__) && defined(__i386__) */
 
 #endif /* PROFILE_INSTRPROFILING_PORT_H_ */